From 28ea73f4c67cb3dd8c972b21d9fdf84ea78d6daa Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:20:40 -0500 Subject: power: remove use of __devexit_p CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton Cc: Anton Vorontsov Cc: David Woodhouse Acked-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/power/wm831x_backup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/power/wm831x_backup.c') diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c index 6243e6975126..6ea6fbd32c20 100644 --- a/drivers/power/wm831x_backup.c +++ b/drivers/power/wm831x_backup.c @@ -220,7 +220,7 @@ static __devexit int wm831x_backup_remove(struct platform_device *pdev) static struct platform_driver wm831x_backup_driver = { .probe = wm831x_backup_probe, - .remove = __devexit_p(wm831x_backup_remove), + .remove = wm831x_backup_remove, .driver = { .name = "wm831x-backup", }, -- cgit v1.2.1 From c8afa6406e60aec6ff90033e5ffe41a206609296 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:22:23 -0500 Subject: power: remove use of __devinit CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton Cc: Anton Vorontsov Cc: David Woodhouse Acked-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/power/wm831x_backup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/power/wm831x_backup.c') diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c index 6ea6fbd32c20..ef3b81788752 100644 --- a/drivers/power/wm831x_backup.c +++ b/drivers/power/wm831x_backup.c @@ -161,7 +161,7 @@ static enum power_supply_property wm831x_backup_props[] = { * Initialisation *********************************************************************/ -static __devinit int wm831x_backup_probe(struct platform_device *pdev) +static int wm831x_backup_probe(struct platform_device *pdev) { struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); struct wm831x_pdata *wm831x_pdata = wm831x->dev->platform_data; -- cgit v1.2.1 From 415ec69fb1861fc377c65cb30ddc76999891b8e1 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:26:07 -0500 Subject: power: remove use of __devexit CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton Cc: Anton Vorontsov Cc: David Woodhouse Acked-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/power/wm831x_backup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/power/wm831x_backup.c') diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c index ef3b81788752..d9cc169f1424 100644 --- a/drivers/power/wm831x_backup.c +++ b/drivers/power/wm831x_backup.c @@ -207,7 +207,7 @@ err_kmalloc: return ret; } -static __devexit int wm831x_backup_remove(struct platform_device *pdev) +static int wm831x_backup_remove(struct platform_device *pdev) { struct wm831x_backup *devdata = platform_get_drvdata(pdev); -- cgit v1.2.1