diff options
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
-rw-r--r-- | drivers/macintosh/via-pmu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index ca3c4aba5a22..75623fd18792 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
@@ -289,7 +289,7 @@ int __init find_via_pmu(void) | |||
289 | if (vias == NULL) | 289 | if (vias == NULL) |
290 | return 0; | 290 | return 0; |
291 | 291 | ||
292 | reg = get_property(vias, "reg", NULL); | 292 | reg = of_get_property(vias, "reg", NULL); |
293 | if (reg == NULL) { | 293 | if (reg == NULL) { |
294 | printk(KERN_ERR "via-pmu: No \"reg\" property !\n"); | 294 | printk(KERN_ERR "via-pmu: No \"reg\" property !\n"); |
295 | goto fail; | 295 | goto fail; |
@@ -331,7 +331,7 @@ int __init find_via_pmu(void) | |||
331 | 331 | ||
332 | gpiop = of_find_node_by_name(NULL, "gpio"); | 332 | gpiop = of_find_node_by_name(NULL, "gpio"); |
333 | if (gpiop) { | 333 | if (gpiop) { |
334 | reg = get_property(gpiop, "reg", NULL); | 334 | reg = of_get_property(gpiop, "reg", NULL); |
335 | if (reg) | 335 | if (reg) |
336 | gaddr = of_translate_address(gpiop, reg); | 336 | gaddr = of_translate_address(gpiop, reg); |
337 | if (gaddr != OF_BAD_ADDR) | 337 | if (gaddr != OF_BAD_ADDR) |
@@ -487,7 +487,7 @@ static int __init via_pmu_dev_init(void) | |||
487 | struct device_node* prim = find_devices("power-mgt"); | 487 | struct device_node* prim = find_devices("power-mgt"); |
488 | const u32 *prim_info = NULL; | 488 | const u32 *prim_info = NULL; |
489 | if (prim) | 489 | if (prim) |
490 | prim_info = get_property(prim, "prim-info", NULL); | 490 | prim_info = of_get_property(prim, "prim-info", NULL); |
491 | if (prim_info) { | 491 | if (prim_info) { |
492 | /* Other stuffs here yet unknown */ | 492 | /* Other stuffs here yet unknown */ |
493 | pmu_battery_count = (prim_info[6] >> 16) & 0xff; | 493 | pmu_battery_count = (prim_info[6] >> 16) & 0xff; |