summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <triad@df.lth.se>2009-03-07 00:23:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-12 16:50:10 +0000
commit6dc4a47a0cf423879b505af0e29997fca4088630 (patch)
tree4cb74ca40842f1b62356fb3d3fbd5df78472c737
parentbff22c9b85c911719a82b6e7cc8925dd84d278c7 (diff)
downloadop-kernel-dev-6dc4a47a0cf423879b505af0e29997fca4088630.zip
op-kernel-dev-6dc4a47a0cf423879b505af0e29997fca4088630.tar.gz
[ARM] 5420/1: MMCI devinit and devexit macros
This adds __devinit and __devexit macros to the module probe and remove functions in MMCI. Now includes the __devexit_p() thing too. Signed-off-by: Linus Walleij <linus.walleij@ericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/mmc/host/mmci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 2909bbc8..a663429 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -490,7 +490,7 @@ static void mmci_check_status(unsigned long data)
mod_timer(&host->timer, jiffies + HZ);
}
-static int mmci_probe(struct amba_device *dev, void *id)
+static int __devinit mmci_probe(struct amba_device *dev, void *id)
{
struct mmc_platform_data *plat = dev->dev.platform_data;
struct mmci_host *host;
@@ -633,7 +633,7 @@ static int mmci_probe(struct amba_device *dev, void *id)
return ret;
}
-static int mmci_remove(struct amba_device *dev)
+static int __devexit mmci_remove(struct amba_device *dev)
{
struct mmc_host *mmc = amba_get_drvdata(dev);
@@ -730,7 +730,7 @@ static struct amba_driver mmci_driver = {
.name = DRIVER_NAME,
},
.probe = mmci_probe,
- .remove = mmci_remove,
+ .remove = __devexit_p(mmci_remove),
.suspend = mmci_suspend,
.resume = mmci_resume,
.id_table = mmci_ids,
OpenPOWER on IntegriCloud