diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-07-07 21:15:13 +0800 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2011-08-19 21:03:21 +0400 |
| commit | 0bea4b866448af09051e357b139f598aa70b8614 (patch) | |
| tree | 7f2acc1deb101704d104979da9e18dc87d331a1b | |
| parent | bd19c756b1a69ec2c8f5f81624d66a1a0daad7c0 (diff) | |
| download | talos-op-linux-0bea4b866448af09051e357b139f598aa70b8614.tar.gz talos-op-linux-0bea4b866448af09051e357b139f598aa70b8614.zip | |
ds2780_battery&z2_battery: Add __devexit_p at necessary places
According to the comments in include/linux/init.h:
"Pointers to __devexit functions must use __devexit_p(function_name), the
wrapper will insert either the function_name or NULL, depending on the config
options."
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Clifton Barnes <cabarnes@indesign-llc.com>
Cc: Peter Edwards <sweetlilmre@gmail.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
| -rw-r--r-- | drivers/power/ds2780_battery.c | 2 | ||||
| -rw-r--r-- | drivers/power/z2_battery.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ds2780_battery.c b/drivers/power/ds2780_battery.c index 1fefe82e12e3..ed25ef5887d4 100644 --- a/drivers/power/ds2780_battery.c +++ b/drivers/power/ds2780_battery.c @@ -832,7 +832,7 @@ static struct platform_driver ds2780_battery_driver = { .name = "ds2780-battery", }, .probe = ds2780_battery_probe, - .remove = ds2780_battery_remove, + .remove = __devexit_p(ds2780_battery_remove), }; static int __init ds2780_battery_init(void) diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c index d119c38b3ff6..ae38c44ccd4e 100644 --- a/drivers/power/z2_battery.c +++ b/drivers/power/z2_battery.c @@ -313,7 +313,7 @@ static struct i2c_driver z2_batt_driver = { .pm = Z2_BATTERY_PM_OPS }, .probe = z2_batt_probe, - .remove = z2_batt_remove, + .remove = __devexit_p(z2_batt_remove), .id_table = z2_batt_id, }; |
