aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-07-07 09:15:13 -0400
committerAnton Vorontsov <cbouatmailru@gmail.com>2011-08-19 13:03:21 -0400
commit0bea4b866448af09051e357b139f598aa70b8614 (patch)
tree7f2acc1deb101704d104979da9e18dc87d331a1b /drivers/power
parentbd19c756b1a69ec2c8f5f81624d66a1a0daad7c0 (diff)
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>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ds2780_battery.c2
-rw-r--r--drivers/power/z2_battery.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ds2780_battery.c b/drivers/power/ds2780_battery.c
index 1fefe82e12e..ed25ef5887d 100644
--- a/drivers/power/ds2780_battery.c
+++ b/drivers/power/ds2780_battery.c
@@ -832,7 +832,7 @@ static struct platform_driver ds2780_battery_driver = {
832 .name = "ds2780-battery", 832 .name = "ds2780-battery",
833 }, 833 },
834 .probe = ds2780_battery_probe, 834 .probe = ds2780_battery_probe,
835 .remove = ds2780_battery_remove, 835 .remove = __devexit_p(ds2780_battery_remove),
836}; 836};
837 837
838static int __init ds2780_battery_init(void) 838static int __init ds2780_battery_init(void)
diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index d119c38b3ff..ae38c44ccd4 100644
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -313,7 +313,7 @@ static struct i2c_driver z2_batt_driver = {
313 .pm = Z2_BATTERY_PM_OPS 313 .pm = Z2_BATTERY_PM_OPS
314 }, 314 },
315 .probe = z2_batt_probe, 315 .probe = z2_batt_probe,
316 .remove = z2_batt_remove, 316 .remove = __devexit_p(z2_batt_remove),
317 .id_table = z2_batt_id, 317 .id_table = z2_batt_id,
318}; 318};
319 319