* [PATCH] power/reset: Remove newly introduced __dev* annotations
@ 2013-01-30 11:28 Thierry Reding
2013-01-30 11:39 ` Andrew Lunn
0 siblings, 1 reply; 3+ messages in thread
From: Thierry Reding @ 2013-01-30 11:28 UTC (permalink / raw)
To: Anton Vorontsov, David Woodhouse; +Cc: Andrew Lunn, linux-kernel
__devinit, __devexit and __devexit_p have recently been removed and
should no longer be used.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
---
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.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] power/reset: Remove newly introduced __dev* annotations
2013-01-30 11:28 [PATCH] power/reset: Remove newly introduced __dev* annotations Thierry Reding
@ 2013-01-30 11:39 ` Andrew Lunn
2013-02-03 3:40 ` Anton Vorontsov
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Lunn @ 2013-01-30 11:39 UTC (permalink / raw)
To: Thierry Reding
Cc: Anton Vorontsov, David Woodhouse, Andrew Lunn, linux-kernel
On Wed, Jan 30, 2013 at 12:28:13PM +0100, Thierry Reding wrote:
> __devinit, __devexit and __devexit_p have recently been removed and
> should no longer be used.
>
> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
> ---
> 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.2
>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Thanks
Andrew
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] power/reset: Remove newly introduced __dev* annotations
2013-01-30 11:39 ` Andrew Lunn
@ 2013-02-03 3:40 ` Anton Vorontsov
0 siblings, 0 replies; 3+ messages in thread
From: Anton Vorontsov @ 2013-02-03 3:40 UTC (permalink / raw)
To: Andrew Lunn; +Cc: Thierry Reding, David Woodhouse, linux-kernel
On Wed, Jan 30, 2013 at 12:39:16PM +0100, Andrew Lunn wrote:
> On Wed, Jan 30, 2013 at 12:28:13PM +0100, Thierry Reding wrote:
> > __devinit, __devexit and __devexit_p have recently been removed and
> > should no longer be used.
> >
> > Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
> > ---
[...]
> Acked-by: Andrew Lunn <andrew@lunn.ch>
Applied, thanks!
Anton
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-03 3:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-30 11:28 [PATCH] power/reset: Remove newly introduced __dev* annotations Thierry Reding
2013-01-30 11:39 ` Andrew Lunn
2013-02-03 3:40 ` Anton Vorontsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®