From 0bea4b866448af09051e357b139f598aa70b8614 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 7 Jul 2011 21:15:13 +0800 Subject: [PATCH] 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 Cc: Clifton Barnes Cc: Peter Edwards Signed-off-by: Anton Vorontsov --- drivers/power/ds2780_battery.c | 2 +- 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, };