ds2780_battery&z2_battery: Add __devexit_p at necessary places
authorAxel Lin <axel.lin@gmail.com>
Thu, 7 Jul 2011 13:15:13 +0000 (21:15 +0800)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Fri, 19 Aug 2011 17:03:21 +0000 (21:03 +0400)
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>
drivers/power/ds2780_battery.c
drivers/power/z2_battery.c

index 1fefe82e12e3b94f59add3abb7af9db44047f1a8..ed25ef5887d47c381812c88bb51d16ae49c8e596 100644 (file)
@@ -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)
index d119c38b3ff632ef158f66a971799c522202c6a3..ae38c44ccd4e00dac12c83bbd0e345d8aba1bb00 100644 (file)
@@ -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,
 };