diff options
author | Arthur Othieno <a.othieno@bluewin.ch> | 2006-01-06 03:11:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:30 -0500 |
commit | c9662b4b37f8f00a212eb4131d1d177b6ed8ddbd (patch) | |
tree | 3224e01f06a95b61dbcc9031596de7b42e1db641 /drivers/macintosh | |
parent | e13ac219816c58579f40b48220b2fa5d94c30e84 (diff) |
[PATCH] macintosh: don't store i2c_add_driver() return if no further processing done
therm_pm72.c and windfarm_lm75_sensor.c both store the return from
i2c_add_driver() but do no further processing on the result. Simply return
what i2c_add_driver() did, instead.
Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/therm_pm72.c | 7 | ||||
-rw-r--r-- | drivers/macintosh/windfarm_lm75_sensor.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 190878eef990..435427daed75 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
@@ -1988,18 +1988,13 @@ static void fcu_lookup_fans(struct device_node *fcu_node) | |||
1988 | 1988 | ||
1989 | static int fcu_of_probe(struct of_device* dev, const struct of_device_id *match) | 1989 | static int fcu_of_probe(struct of_device* dev, const struct of_device_id *match) |
1990 | { | 1990 | { |
1991 | int rc; | ||
1992 | |||
1993 | state = state_detached; | 1991 | state = state_detached; |
1994 | 1992 | ||
1995 | /* Lookup the fans in the device tree */ | 1993 | /* Lookup the fans in the device tree */ |
1996 | fcu_lookup_fans(dev->node); | 1994 | fcu_lookup_fans(dev->node); |
1997 | 1995 | ||
1998 | /* Add the driver */ | 1996 | /* Add the driver */ |
1999 | rc = i2c_add_driver(&therm_pm72_driver); | 1997 | return i2c_add_driver(&therm_pm72_driver); |
2000 | if (rc < 0) | ||
2001 | return rc; | ||
2002 | return 0; | ||
2003 | } | 1998 | } |
2004 | 1999 | ||
2005 | static int fcu_of_remove(struct of_device* dev) | 2000 | static int fcu_of_remove(struct of_device* dev) |
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c index a0a41ad0f2b5..c62ed68a3138 100644 --- a/drivers/macintosh/windfarm_lm75_sensor.c +++ b/drivers/macintosh/windfarm_lm75_sensor.c | |||
@@ -240,12 +240,7 @@ static int wf_lm75_detach(struct i2c_client *client) | |||
240 | 240 | ||
241 | static int __init wf_lm75_sensor_init(void) | 241 | static int __init wf_lm75_sensor_init(void) |
242 | { | 242 | { |
243 | int rc; | 243 | return i2c_add_driver(&wf_lm75_driver); |
244 | |||
245 | rc = i2c_add_driver(&wf_lm75_driver); | ||
246 | if (rc < 0) | ||
247 | return rc; | ||
248 | return 0; | ||
249 | } | 244 | } |
250 | 245 | ||
251 | static void __exit wf_lm75_sensor_exit(void) | 246 | static void __exit wf_lm75_sensor_exit(void) |