[PATCH] power_supply: ds2780_battery/z2_battery: add __devexit_p at necessary places

[PATCH] power_supply: ds2780_battery/z2_battery: add __devexit_p at necessary places

[Axel Lin]

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>
---
 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 1fefe82..ed25ef5 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 d119c38..ae38c44 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,
 };
 
-- 
1.7.4.1

Re: [PATCH] power_supply: ds2780_battery/z2_battery: add __devexit_p at necessary places

[Anton Vorontsov]

On Thu, Jul 07, 2011 at 09:15:13PM +0800, Axel Lin wrote:
> 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>
> ---

Applied, thanks.

-- 
Anton Vorontsov
Email: cbouatmailru@gmail.com

RE: [PATCH] power_supply: ds2780_battery/z2_battery: add __devexit_p at necessary places

[Barnes, Clifton A.]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 570 bytes --]

On Thursday, July 07, 2011 9:15 AM, Axel Lin wrote:

> 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>

Checked out ok here for ds2780.

Acked-by: Clifton Barnes <cabarnes@indesign-llc.com>
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥