diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2006-07-12 01:40:29 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 01:55:05 -0400 |
commit | 018a3d1db7cdb6127656c1622ee1d2302e16436d (patch) | |
tree | 5b6714fa9fcd1441f7c1b30e0391484c095925b6 /drivers/macintosh/therm_adt746x.c | |
parent | eeb2b723ef5100fafa381d92eb70d83e98516a44 (diff) |
[POWERPC] powermac: Constify & voidify get_property()
Now that get_property() returns a void *, there's no need to cast its
return value. Also, treat the return value as const, so we can
constify get_property later.
powermac platform & macintosh driver changes.
Built for pmac32_defconfig, g5_defconfig
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 7f86478bdd36..a0f30d0853ea 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
@@ -47,7 +47,7 @@ static u8 FAN_SPD_SET[2] = {0x30, 0x31}; | |||
47 | 47 | ||
48 | static u8 default_limits_local[3] = {70, 50, 70}; /* local, sensor1, sensor2 */ | 48 | static u8 default_limits_local[3] = {70, 50, 70}; /* local, sensor1, sensor2 */ |
49 | static u8 default_limits_chip[3] = {80, 65, 80}; /* local, sensor1, sensor2 */ | 49 | static u8 default_limits_chip[3] = {80, 65, 80}; /* local, sensor1, sensor2 */ |
50 | static char *sensor_location[3] = {NULL, NULL, NULL}; | 50 | static const char *sensor_location[3] = {NULL, NULL, NULL}; |
51 | 51 | ||
52 | static int limit_adjust = 0; | 52 | static int limit_adjust = 0; |
53 | static int fan_speed = -1; | 53 | static int fan_speed = -1; |
@@ -553,7 +553,7 @@ static int __init | |||
553 | thermostat_init(void) | 553 | thermostat_init(void) |
554 | { | 554 | { |
555 | struct device_node* np; | 555 | struct device_node* np; |
556 | u32 *prop; | 556 | const u32 *prop; |
557 | int i = 0, offset = 0; | 557 | int i = 0, offset = 0; |
558 | 558 | ||
559 | np = of_find_node_by_name(NULL, "fan"); | 559 | np = of_find_node_by_name(NULL, "fan"); |
@@ -566,13 +566,13 @@ thermostat_init(void) | |||
566 | else | 566 | else |
567 | return -ENODEV; | 567 | return -ENODEV; |
568 | 568 | ||
569 | prop = (u32 *)get_property(np, "hwsensor-params-version", NULL); | 569 | prop = get_property(np, "hwsensor-params-version", NULL); |
570 | printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop, | 570 | printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop, |
571 | (*prop == 1)?"":"un"); | 571 | (*prop == 1)?"":"un"); |
572 | if (*prop != 1) | 572 | if (*prop != 1) |
573 | return -ENODEV; | 573 | return -ENODEV; |
574 | 574 | ||
575 | prop = (u32 *)get_property(np, "reg", NULL); | 575 | prop = get_property(np, "reg", NULL); |
576 | if (!prop) | 576 | if (!prop) |
577 | return -ENODEV; | 577 | return -ENODEV; |
578 | 578 | ||