Skip to contentSkip to conversation

Use __devexit_p in wbsd

PATCH Applied Pierre Ossman 3 participants 4 messages Nov 7, 2005 – Nov 9, 2005 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Use __devexit_p in wbsd

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

---

 drivers/mmc/wbsd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/wbsd.c +2 -2
@@ -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,
#1 lore raw
Quoted 2 lines · Pierre Ossman

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...?

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core
#2 lore raw
Quoted 8 lines · Russell King
Quoted 2 lines · Pierre Ossman

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

[MMC] Use __devexit_p in wbsd

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

---

 drivers/mmc/wbsd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/wbsd.c +2 -2
@@ -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 */
Applied
#3 lore raw
Quoted 2 lines · Pierre Ossman

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

Applied, thanks.

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