From 60a1c4d41b3af91366bcb2a52b30b2050a48273e Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 30 Jan 2013 12:28:13 +0100 Subject: power/reset: Remove newly introduced __dev* annotations __devinit, __devexit and __devexit_p have recently been removed and should no longer be used. Signed-off-by: Thierry Reding Signed-off-by: Jason Cooper Acked-by: Andrew Lunn Signed-off-by: Anton Vorontsov --- drivers/power/reset/restart-poweroff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/power') diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c index b11b9e887174..059cd1501e2a 100644 --- a/drivers/power/reset/restart-poweroff.c +++ b/drivers/power/reset/restart-poweroff.c @@ -22,7 +22,7 @@ static void restart_poweroff_do_poweroff(void) arm_pm_restart('h', NULL); } -static int __devinit restart_poweroff_probe(struct platform_device *pdev) +static int restart_poweroff_probe(struct platform_device *pdev) { /* If a pm_power_off function has already been added, leave it alone */ if (pm_power_off != NULL) { @@ -35,7 +35,7 @@ static int __devinit restart_poweroff_probe(struct platform_device *pdev) return 0; } -static int __devexit restart_poweroff_remove(struct platform_device *pdev) +static int restart_poweroff_remove(struct platform_device *pdev) { if (pm_power_off == &restart_poweroff_do_poweroff) pm_power_off = NULL; @@ -50,7 +50,7 @@ static const struct of_device_id of_restart_poweroff_match[] = { static struct platform_driver restart_poweroff_driver = { .probe = restart_poweroff_probe, - .remove = __devexit_p(restart_poweroff_remove), + .remove = restart_poweroff_remove, .driver = { .name = "poweroff-restart", .owner = THIS_MODULE, -- cgit v1.2.3