aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/therm_pm72.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/therm_pm72.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/therm_pm72.c')
-rw-r--r--drivers/macintosh/therm_pm72.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 78ff18617139..2e4ad44a8636 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -674,7 +674,7 @@ static int read_eeprom(int cpu, struct mpu_data *out)
674 printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n"); 674 printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n");
675 return -ENODEV; 675 return -ENODEV;
676 } 676 }
677 data = of_get_property(np, "cpuid", &len); 677 data = get_property(np, "cpuid", &len);
678 if (data == NULL) { 678 if (data == NULL) {
679 printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n"); 679 printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n");
680 of_node_put(np); 680 of_node_put(np);
@@ -1337,7 +1337,7 @@ static int init_backside_state(struct backside_pid_state *state)
1337 */ 1337 */
1338 u3 = of_find_node_by_path("/u3@0,f8000000"); 1338 u3 = of_find_node_by_path("/u3@0,f8000000");
1339 if (u3 != NULL) { 1339 if (u3 != NULL) {
1340 const u32 *vers = of_get_property(u3, "device-rev", NULL); 1340 const u32 *vers = get_property(u3, "device-rev", NULL);
1341 if (vers) 1341 if (vers)
1342 if (((*vers) & 0x3f) < 0x34) 1342 if (((*vers) & 0x3f) < 0x34)
1343 u3h = 0; 1343 u3h = 0;
@@ -2129,8 +2129,8 @@ static void fcu_lookup_fans(struct device_node *fcu_node)
2129 continue; 2129 continue;
2130 2130
2131 /* Lookup for a matching location */ 2131 /* Lookup for a matching location */
2132 loc = of_get_property(np, "location", NULL); 2132 loc = get_property(np, "location", NULL);
2133 reg = of_get_property(np, "reg", NULL); 2133 reg = get_property(np, "reg", NULL);
2134 if (loc == NULL || reg == NULL) 2134 if (loc == NULL || reg == NULL)
2135 continue; 2135 continue;
2136 DBG(" matching location: %s, reg: 0x%08x\n", loc, *reg); 2136 DBG(" matching location: %s, reg: 0x%08x\n", loc, *reg);