diff mbox

power/reset: restart: remove __dev{init,exit}

Message ID 1359658469-14856-1-git-send-email-jason@lakedaemon.net (mailing list archive)
State New, archived
Headers show

Commit Message

Jason Cooper Jan. 31, 2013, 6:54 p.m. UTC 
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
 drivers/power/reset/restart-poweroff.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Jason Cooper Jan. 31, 2013, 6:57 p.m. UTC | #1 
Anton,

I forgot to mention, this fixes a build breakage on battery/master.

thx,

Jason.

On Thu, Jan 31, 2013 at 06:54:29PM +0000, Jason Cooper wrote:
> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> ---
>  drivers/power/reset/restart-poweroff.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c
> index b11b9e8..059cd15 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,
> -- 
> 1.8.1.1
>
Andrew Lunn Jan. 31, 2013, 8:02 p.m. UTC | #2 
On Thu, Jan 31, 2013 at 06:54:29PM +0000, Jason Cooper wrote:
> Signed-off-by: Jason Cooper <jason@lakedaemon.net>

Hi Jason

I Acked-by: a very similar patch to this yesterday....

https://lkml.org/lkml/2013/1/30/233

	Andrew

> ---
>  drivers/power/reset/restart-poweroff.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c
> index b11b9e8..059cd15 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,
> -- 
> 1.8.1.1
>
Jason Cooper Jan. 31, 2013, 8:20 p.m. UTC | #3 
On Thu, Jan 31, 2013 at 09:02:50PM +0100, Andrew Lunn wrote:
> On Thu, Jan 31, 2013 at 06:54:29PM +0000, Jason Cooper wrote:
> > Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> 
> Hi Jason
> 
> I Acked-by: a very similar patch to this yesterday....
> 
> https://lkml.org/lkml/2013/1/30/233

Hmm, I need to read more carefully.  My auto-flagging script didn't
catch it because it didn't have any of the mvebu/kirkwood/dove/orion
keywords in it :-(

Sorry for the noise.

thx,

Jason.
Anton Vorontsov Feb. 3, 2013, 3:43 a.m. UTC | #4 
On Thu, Jan 31, 2013 at 03:20:00PM -0500, Jason Cooper wrote:
> On Thu, Jan 31, 2013 at 09:02:50PM +0100, Andrew Lunn wrote:
> > On Thu, Jan 31, 2013 at 06:54:29PM +0000, Jason Cooper wrote:
> > > Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> > 
> > Hi Jason
> > 
> > I Acked-by: a very similar patch to this yesterday....
> > 
> > https://lkml.org/lkml/2013/1/30/233

I've added Jason's Signed-off-by to the Thierry's patch.

Thanks!

Anton
diff mbox

Patch

diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c
index b11b9e8..059cd15 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,