summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/via-pmu.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-26 22:24:31 +1000
committerPaul Mackerras <paulus@samba.org>2007-04-26 22:24:31 +1000
commita48141db68e4b9143759435badcc1a49d9022db4 (patch)
treea7d9e5e259c5aa44131e5d1e280f772edb5cdeb5 /drivers/macintosh/via-pmu.c
parent0999ed7f57728c1919b131207e47d9b311cfbd74 (diff)
downloadblackbird-op-linux-a48141db68e4b9143759435badcc1a49d9022db4.tar.gz
blackbird-op-linux-a48141db68e4b9143759435badcc1a49d9022db4.zip
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)
if (vias == NULL)
return 0;
- reg = of_get_property(vias, "reg", NULL);
+ reg = get_property(vias, "reg", NULL);
if (reg == NULL) {
printk(KERN_ERR "via-pmu: No \"reg\" property !\n");
goto fail;
@@ -334,7 +334,7 @@ int __init find_via_pmu(void)
gpiop = of_find_node_by_name(NULL, "gpio");
if (gpiop) {
- reg = of_get_property(gpiop, "reg", NULL);
+ reg = get_property(gpiop, "reg", NULL);
if (reg)
gaddr = of_translate_address(gpiop, reg);
if (gaddr != OF_BAD_ADDR)
@@ -491,7 +491,7 @@ static int __init via_pmu_dev_init(void)
of_find_node_by_name(NULL, "power-mgt");
const u32 *prim_info = NULL;
if (prim)
- prim_info = of_get_property(prim, "prim-info", NULL);
+ prim_info = get_property(prim, "prim-info", NULL);
if (prim_info) {
/* Other stuffs here yet unknown */
pmu_battery_count = (prim_info[6] >> 16) & 0xff;
OpenPOWER on IntegriCloud