aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/via-pmu.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-26 08:24:31 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-26 08:24:31 -0400
commita48141db68e4b9143759435badcc1a49d9022db4 (patch)
treea7d9e5e259c5aa44131e5d1e280f772edb5cdeb5 /drivers/macintosh/via-pmu.c
parent0999ed7f57728c1919b131207e47d9b311cfbd74 (diff)
Revert "[POWERPC] Rename get_property to of_get_property: drivers"
This reverts commit d05c7a80cf39ae7d0f8d0c3e47c93d51fcd393d3, which included changes which should go via other subsystem maintainers.
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
-rw-r--r--drivers/macintosh/via-pmu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 1729d3fd7a11..8470210db7f6 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 = of_get_property(vias, "reg", NULL); 292 reg = 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;
@@ -334,7 +334,7 @@ int __init find_via_pmu(void)
334 334
335 gpiop = of_find_node_by_name(NULL, "gpio"); 335 gpiop = of_find_node_by_name(NULL, "gpio");
336 if (gpiop) { 336 if (gpiop) {
337 reg = of_get_property(gpiop, "reg", NULL); 337 reg = get_property(gpiop, "reg", NULL);
338 if (reg) 338 if (reg)
339 gaddr = of_translate_address(gpiop, reg); 339 gaddr = of_translate_address(gpiop, reg);
340 if (gaddr != OF_BAD_ADDR) 340 if (gaddr != OF_BAD_ADDR)
@@ -491,7 +491,7 @@ static int __init via_pmu_dev_init(void)
491 of_find_node_by_name(NULL, "power-mgt"); 491 of_find_node_by_name(NULL, "power-mgt");
492 const u32 *prim_info = NULL; 492 const u32 *prim_info = NULL;
493 if (prim) 493 if (prim)
494 prim_info = of_get_property(prim, "prim-info", NULL); 494 prim_info = get_property(prim, "prim-info", NULL);
495 if (prim_info) { 495 if (prim_info) {
496 /* Other stuffs here yet unknown */ 496 /* Other stuffs here yet unknown */
497 pmu_battery_count = (prim_info[6] >> 16) & 0xff; 497 pmu_battery_count = (prim_info[6] >> 16) & 0xff;