diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-26 08:24:31 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-26 08:24:31 -0400 |
commit | a48141db68e4b9143759435badcc1a49d9022db4 (patch) | |
tree | a7d9e5e259c5aa44131e5d1e280f772edb5cdeb5 /drivers/macintosh/therm_adt746x.c | |
parent | 0999ed7f57728c1919b131207e47d9b311cfbd74 (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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index 228903403cfc..a7ce55926638 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
@@ -567,13 +567,13 @@ thermostat_init(void) | |||
567 | else | 567 | else |
568 | return -ENODEV; | 568 | return -ENODEV; |
569 | 569 | ||
570 | prop = of_get_property(np, "hwsensor-params-version", NULL); | 570 | prop = get_property(np, "hwsensor-params-version", NULL); |
571 | printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop, | 571 | printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop, |
572 | (*prop == 1)?"":"un"); | 572 | (*prop == 1)?"":"un"); |
573 | if (*prop != 1) | 573 | if (*prop != 1) |
574 | return -ENODEV; | 574 | return -ENODEV; |
575 | 575 | ||
576 | prop = of_get_property(np, "reg", NULL); | 576 | prop = get_property(np, "reg", NULL); |
577 | if (!prop) | 577 | if (!prop) |
578 | return -ENODEV; | 578 | return -ENODEV; |
579 | 579 | ||
@@ -591,9 +591,9 @@ thermostat_init(void) | |||
591 | "limit_adjust: %d, fan_speed: %d\n", | 591 | "limit_adjust: %d, fan_speed: %d\n", |
592 | therm_bus, therm_address, limit_adjust, fan_speed); | 592 | therm_bus, therm_address, limit_adjust, fan_speed); |
593 | 593 | ||
594 | if (of_get_property(np, "hwsensor-location", NULL)) { | 594 | if (get_property(np, "hwsensor-location", NULL)) { |
595 | for (i = 0; i < 3; i++) { | 595 | for (i = 0; i < 3; i++) { |
596 | sensor_location[i] = of_get_property(np, | 596 | sensor_location[i] = get_property(np, |
597 | "hwsensor-location", NULL) + offset; | 597 | "hwsensor-location", NULL) + offset; |
598 | 598 | ||
599 | if (sensor_location[i] == NULL) | 599 | if (sensor_location[i] == NULL) |