aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/pasemi
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-04-29 16:29:08 +1000
committerPaul Mackerras <paulus@samba.org>2007-04-30 11:02:05 +1000
commit12d371a69e6df96cd949af6bcb569e978e8f9d41 (patch)
tree30ed043c2d262b1bf25cbc0a1e19111dc7ac407e /arch/powerpc/platforms/pasemi
parent8d1cea6e1439a113b1f17eab9b4e2f0cfc24bbb0 (diff)
[POWERPC] get_property cleanups
Just another pass through arch/powerpc for old usages. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/pasemi')
-rw-r--r--arch/powerpc/platforms/pasemi/cpufreq.c11
-rw-r--r--arch/powerpc/platforms/pasemi/gpio_mdio.c6
2 files changed, 9 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c
index 4dd5c512f86..2a57d602368 100644
--- a/arch/powerpc/platforms/pasemi/cpufreq.c
+++ b/arch/powerpc/platforms/pasemi/cpufreq.c
@@ -134,7 +134,8 @@ void restore_astate(int cpu)
static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
{
- u32 *max_freq;
+ const u32 *max_freqp;
+ u32 max_freq;
int i, cur_astate;
struct resource res;
struct device_node *cpu, *dn;
@@ -175,16 +176,16 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
pr_debug("init cpufreq on CPU %d\n", policy->cpu);
- max_freq = (u32*) get_property(cpu, "clock-frequency", NULL);
- if (!max_freq) {
+ max_freqp = of_get_property(cpu, "clock-frequency", NULL);
+ if (!max_freqp) {
err = -EINVAL;
goto out_unmap_sdcpwr;
}
/* we need the freq in kHz */
- *max_freq /= 1000;
+ max_freq = *max_freqp / 1000;
- pr_debug("max clock-frequency is at %u kHz\n", *max_freq);
+ pr_debug("max clock-frequency is at %u kHz\n", max_freq);
pr_debug("initializing frequency table\n");
/* initialize frequency table */
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index b1d3b6b420a..c91a33593bb 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -258,7 +258,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
new_bus->write = &gpio_mdio_write,
new_bus->reset = &gpio_mdio_reset,
- prop = get_property(np, "reg", NULL);
+ prop = of_get_property(np, "reg", NULL);
new_bus->id = *prop;
new_bus->priv = priv;
@@ -269,10 +269,10 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
new_bus->irq[i] = irq_create_mapping(NULL, 10);
- prop = get_property(np, "mdc-pin", NULL);
+ prop = of_get_property(np, "mdc-pin", NULL);
priv->mdc_pin = *prop;
- prop = get_property(np, "mdio-pin", NULL);
+ prop = of_get_property(np, "mdio-pin", NULL);
priv->mdio_pin = *prop;
new_bus->dev = dev;