[PATCH] [MMC] Use __devexit_p in wbsd

[PATCH] [MMC] Use __devexit_p in wbsd

[Pierre Ossman]

wbsd_*_remove() is declared as __devexit but __devexit_p isn't used
when taking their addresses.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

 drivers/mmc/wbsd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -2110,7 +2110,7 @@ static struct device_driver wbsd_driver 
 	.name		= DRIVER_NAME,
 	.bus		= &platform_bus_type,
 	.probe		= wbsd_probe,
-	.remove		= wbsd_remove,
+	.remove		= __devexit_p(wbsd_remove),
 
 	.suspend	= wbsd_platform_suspend,
 	.resume		= wbsd_platform_resume,
@@ -2122,7 +2122,7 @@ static struct pnp_driver wbsd_pnp_driver
 	.name		= DRIVER_NAME,
 	.id_table	= pnp_dev_table,
 	.probe		= wbsd_pnp_probe,
-	.remove		= wbsd_pnp_remove,
+	.remove		= __devexit_p(wbsd_pnp_remove),
 
 	.suspend	= wbsd_pnp_suspend,
 	.resume		= wbsd_pnp_resume,

Re: [PATCH] [MMC] Use __devexit_p in wbsd

[Russell King]

On Mon, Nov 07, 2005 at 08:04:59AM +0100, Pierre Ossman wrote:
> wbsd_*_remove() is declared as __devexit but __devexit_p isn't used
> when taking their addresses.

This patch has been generated assuming that your PNP suspend/resume
patches are in... what do you want me to do with this?  Wait for
the PNP patches to hit mainline, or...?

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core

Re: [PATCH] [MMC] Use __devexit_p in wbsd

[Pierre Ossman]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

Russell King wrote:
> On Mon, Nov 07, 2005 at 08:04:59AM +0100, Pierre Ossman wrote:
>> wbsd_*_remove() is declared as __devexit but __devexit_p isn't used
>> when taking their addresses.
> 
> This patch has been generated assuming that your PNP suspend/resume
> patches are in... what do you want me to do with this?  Wait for
> the PNP patches to hit mainline, or...?
> 

Sorry about that. Improper patch ordering on my part. Here's one where 
it's applied before the suspend stuff.

Rgds
Pierre


[-- Attachment #2: wbsd-devexitp.patch --]
[-- Type: text/x-patch, Size: 877 bytes --]

[MMC] Use __devexit_p in wbsd

wbsd_*_remove() is declared as __devexit but __devexit_p isn't used
when taking their addresses.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

 drivers/mmc/wbsd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -2042,7 +2042,7 @@ static struct device_driver wbsd_driver 
 	.name		= DRIVER_NAME,
 	.bus		= &platform_bus_type,
 	.probe		= wbsd_probe,
-	.remove		= wbsd_remove,
+	.remove		= __devexit_p(wbsd_remove),
 
 	.suspend	= wbsd_suspend,
 	.resume		= wbsd_resume,
@@ -2054,7 +2054,7 @@ static struct pnp_driver wbsd_pnp_driver
 	.name		= DRIVER_NAME,
 	.id_table	= pnp_dev_table,
 	.probe		= wbsd_pnp_probe,
-	.remove		= wbsd_pnp_remove,
+	.remove		= __devexit_p(wbsd_pnp_remove),
 };
 
 #endif /* CONFIG_PNP */

Re: [PATCH] [MMC] Use __devexit_p in wbsd

[Russell King]

On Wed, Nov 09, 2005 at 12:28:46AM +0100, Pierre Ossman wrote:
> Sorry about that. Improper patch ordering on my part. Here's one where 
> it's applied before the suspend stuff.

Applied, thanks.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core