power/reset: Remove newly introduced __dev* annotations
PATCH 1/1 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 <[email protected]>
--- drivers/power/reset/restart-poweroff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/reset/restart-poweroff.c +3 -3
@@ -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 ,
Signature · 1 line
1.8.1.2
Quoted 42 lines · Thierry Reding
__devinit,__devexitand__devexit_phave recently been removed and should no longer be used.Signed-off-by Thierry Reding <[email protected]>--- drivers/power/reset/restart-poweroff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/power/reset/restart-poweroff.c +3
-3@@ -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 ,Signature · 1 line
1.8.1.2
Acked-by Andrew Lunn <[email protected]>
Thanks
Andrew
Anton Vorontsov
AppliedQuoted 6 lines · Andrew Lunn
Quoted 5 lines · Thierry Reding
__devinit,__devexitand__devexit_phave recently been removed and should no longer be used.Signed-off-by Thierry Reding <[email protected]>---
[...]
Quoted 1 line
Acked-by Andrew Lunn <[email protected]>
Applied, thanks!
Anton