diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:23:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 15:28:18 -0500 |
commit | c3be1efd41a97f93be390240387d356a07b664c7 (patch) | |
tree | 92f92de6c14e8a564855649662489ea9a9aada38 /drivers/mmc/host/wbsd.c | |
parent | 0433c14356702e296f474f77ebd42f0a9d9a5487 (diff) |
mmc: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Chris Ball <cjb@laptop.org>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Cc: Venkatraman S <svenkatr@ti.com>
Cc: Ian Molton <ian@mnementh.co.uk>
Cc: Bruce Chang <brucechang@via.com.tw>
Cc: Harald Welte <HaraldWelte@viatech.com>
Cc: Pierre Ossman <pierre@ossman.eu>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mmc/host/wbsd.c')
-rw-r--r-- | drivers/mmc/host/wbsd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c index 3c8ef5994073..d71358a2695d 100644 --- a/drivers/mmc/host/wbsd.c +++ b/drivers/mmc/host/wbsd.c | |||
@@ -1196,7 +1196,7 @@ static irqreturn_t wbsd_irq(int irq, void *dev_id) | |||
1196 | * Allocate/free MMC structure. | 1196 | * Allocate/free MMC structure. |
1197 | */ | 1197 | */ |
1198 | 1198 | ||
1199 | static int __devinit wbsd_alloc_mmc(struct device *dev) | 1199 | static int wbsd_alloc_mmc(struct device *dev) |
1200 | { | 1200 | { |
1201 | struct mmc_host *mmc; | 1201 | struct mmc_host *mmc; |
1202 | struct wbsd_host *host; | 1202 | struct wbsd_host *host; |
@@ -1288,7 +1288,7 @@ static void wbsd_free_mmc(struct device *dev) | |||
1288 | * Scan for known chip id:s | 1288 | * Scan for known chip id:s |
1289 | */ | 1289 | */ |
1290 | 1290 | ||
1291 | static int __devinit wbsd_scan(struct wbsd_host *host) | 1291 | static int wbsd_scan(struct wbsd_host *host) |
1292 | { | 1292 | { |
1293 | int i, j, k; | 1293 | int i, j, k; |
1294 | int id; | 1294 | int id; |
@@ -1344,7 +1344,7 @@ static int __devinit wbsd_scan(struct wbsd_host *host) | |||
1344 | * Allocate/free io port ranges | 1344 | * Allocate/free io port ranges |
1345 | */ | 1345 | */ |
1346 | 1346 | ||
1347 | static int __devinit wbsd_request_region(struct wbsd_host *host, int base) | 1347 | static int wbsd_request_region(struct wbsd_host *host, int base) |
1348 | { | 1348 | { |
1349 | if (base & 0x7) | 1349 | if (base & 0x7) |
1350 | return -EINVAL; | 1350 | return -EINVAL; |
@@ -1374,7 +1374,7 @@ static void wbsd_release_regions(struct wbsd_host *host) | |||
1374 | * Allocate/free DMA port and buffer | 1374 | * Allocate/free DMA port and buffer |
1375 | */ | 1375 | */ |
1376 | 1376 | ||
1377 | static void __devinit wbsd_request_dma(struct wbsd_host *host, int dma) | 1377 | static void wbsd_request_dma(struct wbsd_host *host, int dma) |
1378 | { | 1378 | { |
1379 | if (dma < 0) | 1379 | if (dma < 0) |
1380 | return; | 1380 | return; |
@@ -1452,7 +1452,7 @@ static void wbsd_release_dma(struct wbsd_host *host) | |||
1452 | * Allocate/free IRQ. | 1452 | * Allocate/free IRQ. |
1453 | */ | 1453 | */ |
1454 | 1454 | ||
1455 | static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq) | 1455 | static int wbsd_request_irq(struct wbsd_host *host, int irq) |
1456 | { | 1456 | { |
1457 | int ret; | 1457 | int ret; |
1458 | 1458 | ||
@@ -1502,7 +1502,7 @@ static void wbsd_release_irq(struct wbsd_host *host) | |||
1502 | * Allocate all resources for the host. | 1502 | * Allocate all resources for the host. |
1503 | */ | 1503 | */ |
1504 | 1504 | ||
1505 | static int __devinit wbsd_request_resources(struct wbsd_host *host, | 1505 | static int wbsd_request_resources(struct wbsd_host *host, |
1506 | int base, int irq, int dma) | 1506 | int base, int irq, int dma) |
1507 | { | 1507 | { |
1508 | int ret; | 1508 | int ret; |
@@ -1644,7 +1644,7 @@ static void wbsd_chip_poweroff(struct wbsd_host *host) | |||
1644 | * * | 1644 | * * |
1645 | \*****************************************************************************/ | 1645 | \*****************************************************************************/ |
1646 | 1646 | ||
1647 | static int __devinit wbsd_init(struct device *dev, int base, int irq, int dma, | 1647 | static int wbsd_init(struct device *dev, int base, int irq, int dma, |
1648 | int pnp) | 1648 | int pnp) |
1649 | { | 1649 | { |
1650 | struct wbsd_host *host = NULL; | 1650 | struct wbsd_host *host = NULL; |
@@ -1762,7 +1762,7 @@ static void __devexit wbsd_shutdown(struct device *dev, int pnp) | |||
1762 | * Non-PnP | 1762 | * Non-PnP |
1763 | */ | 1763 | */ |
1764 | 1764 | ||
1765 | static int __devinit wbsd_probe(struct platform_device *dev) | 1765 | static int wbsd_probe(struct platform_device *dev) |
1766 | { | 1766 | { |
1767 | /* Use the module parameters for resources */ | 1767 | /* Use the module parameters for resources */ |
1768 | return wbsd_init(&dev->dev, param_io, param_irq, param_dma, 0); | 1768 | return wbsd_init(&dev->dev, param_io, param_irq, param_dma, 0); |
@@ -1781,7 +1781,7 @@ static int __devexit wbsd_remove(struct platform_device *dev) | |||
1781 | 1781 | ||
1782 | #ifdef CONFIG_PNP | 1782 | #ifdef CONFIG_PNP |
1783 | 1783 | ||
1784 | static int __devinit | 1784 | static int |
1785 | wbsd_pnp_probe(struct pnp_dev *pnpdev, const struct pnp_device_id *dev_id) | 1785 | wbsd_pnp_probe(struct pnp_dev *pnpdev, const struct pnp_device_id *dev_id) |
1786 | { | 1786 | { |
1787 | int io, irq, dma; | 1787 | int io, irq, dma; |