aboutsummaryrefslogtreecommitdiff
path: root/drivers/macintosh/therm_adt746x.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/therm_adt746x.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_adt746x.c')
-rw-r--r--drivers/macintosh/therm_adt746x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 228903403cf..a7ce5592663 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -567,13 +567,13 @@ thermostat_init(void)
else
return -ENODEV;
- prop = of_get_property(np, "hwsensor-params-version", NULL);
+ prop = get_property(np, "hwsensor-params-version", NULL);
printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop,
(*prop == 1)?"":"un");
if (*prop != 1)
return -ENODEV;
- prop = of_get_property(np, "reg", NULL);
+ prop = get_property(np, "reg", NULL);
if (!prop)
return -ENODEV;
@@ -591,9 +591,9 @@ thermostat_init(void)
"limit_adjust: %d, fan_speed: %d\n",
therm_bus, therm_address, limit_adjust, fan_speed);
- if (of_get_property(np, "hwsensor-location", NULL)) {
+ if (get_property(np, "hwsensor-location", NULL)) {
for (i = 0; i < 3; i++) {
- sensor_location[i] = of_get_property(np,
+ sensor_location[i] = get_property(np,
"hwsensor-location", NULL) + offset;
if (sensor_location[i] == NULL)