Commit 6e0ee714 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

mmc: remove use of __devexit

CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Cc: Venkatraman S <svenkatr@ti.com>
Cc: Viresh Kumar <viresh.linux@gmail.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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9647f84d
...@@ -1114,7 +1114,7 @@ static int au1xmmc_probe(struct platform_device *pdev) ...@@ -1114,7 +1114,7 @@ static int au1xmmc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit au1xmmc_remove(struct platform_device *pdev) static int au1xmmc_remove(struct platform_device *pdev)
{ {
struct au1xmmc_host *host = platform_get_drvdata(pdev); struct au1xmmc_host *host = platform_get_drvdata(pdev);
......
...@@ -617,7 +617,7 @@ static int sdh_probe(struct platform_device *pdev) ...@@ -617,7 +617,7 @@ static int sdh_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit sdh_remove(struct platform_device *pdev) static int sdh_remove(struct platform_device *pdev)
{ {
struct mmc_host *mmc = platform_get_drvdata(pdev); struct mmc_host *mmc = platform_get_drvdata(pdev);
......
...@@ -746,7 +746,7 @@ static int cb710_mmc_init(struct platform_device *pdev) ...@@ -746,7 +746,7 @@ static int cb710_mmc_init(struct platform_device *pdev)
return err; return err;
} }
static int __devexit cb710_mmc_exit(struct platform_device *pdev) static int cb710_mmc_exit(struct platform_device *pdev)
{ {
struct cb710_slot *slot = cb710_pdev_to_slot(pdev); struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
struct mmc_host *mmc = cb710_slot_to_mmc(slot); struct mmc_host *mmc = cb710_slot_to_mmc(slot);
......
...@@ -85,7 +85,7 @@ static int dw_mci_pci_probe(struct pci_dev *pdev, ...@@ -85,7 +85,7 @@ static int dw_mci_pci_probe(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit dw_mci_pci_remove(struct pci_dev *pdev) static void dw_mci_pci_remove(struct pci_dev *pdev)
{ {
struct dw_mci *host = pci_get_drvdata(pdev); struct dw_mci *host = pci_get_drvdata(pdev);
......
...@@ -67,7 +67,7 @@ static int dw_mci_pltfm_probe(struct platform_device *pdev) ...@@ -67,7 +67,7 @@ static int dw_mci_pltfm_probe(struct platform_device *pdev)
return dw_mci_pltfm_register(pdev, NULL); return dw_mci_pltfm_register(pdev, NULL);
} }
static int __devexit dw_mci_pltfm_remove(struct platform_device *pdev) static int dw_mci_pltfm_remove(struct platform_device *pdev)
{ {
struct dw_mci *host = platform_get_drvdata(pdev); struct dw_mci *host = platform_get_drvdata(pdev);
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
extern int dw_mci_pltfm_register(struct platform_device *pdev, extern int dw_mci_pltfm_register(struct platform_device *pdev,
const struct dw_mci_drv_data *drv_data); const struct dw_mci_drv_data *drv_data);
extern int __devexit dw_mci_pltfm_remove(struct platform_device *pdev); extern int dw_mci_pltfm_remove(struct platform_device *pdev);
extern const struct dev_pm_ops dw_mci_pltfm_pmops; extern const struct dev_pm_ops dw_mci_pltfm_pmops;
#endif /* _DW_MMC_PLTFM_H_ */ #endif /* _DW_MMC_PLTFM_H_ */
...@@ -938,7 +938,7 @@ static int jz4740_mmc_probe(struct platform_device* pdev) ...@@ -938,7 +938,7 @@ static int jz4740_mmc_probe(struct platform_device* pdev)
return ret; return ret;
} }
static int __devexit jz4740_mmc_remove(struct platform_device *pdev) static int jz4740_mmc_remove(struct platform_device *pdev)
{ {
struct jz4740_mmc_host *host = platform_get_drvdata(pdev); struct jz4740_mmc_host *host = platform_get_drvdata(pdev);
......
...@@ -1485,7 +1485,7 @@ static int mmc_spi_probe(struct spi_device *spi) ...@@ -1485,7 +1485,7 @@ static int mmc_spi_probe(struct spi_device *spi)
} }
static int __devexit mmc_spi_remove(struct spi_device *spi) static int mmc_spi_remove(struct spi_device *spi)
{ {
struct mmc_host *mmc = dev_get_drvdata(&spi->dev); struct mmc_host *mmc = dev_get_drvdata(&spi->dev);
struct mmc_spi_host *host; struct mmc_spi_host *host;
......
...@@ -337,7 +337,7 @@ static void mmci_dma_setup(struct mmci_host *host) ...@@ -337,7 +337,7 @@ static void mmci_dma_setup(struct mmci_host *host)
} }
/* /*
* This is used in or __devexit so inline it * This is used in or so inline it
* so it can be discarded. * so it can be discarded.
*/ */
static inline void mmci_dma_release(struct mmci_host *host) static inline void mmci_dma_release(struct mmci_host *host)
...@@ -1522,7 +1522,7 @@ static int mmci_probe(struct amba_device *dev, ...@@ -1522,7 +1522,7 @@ static int mmci_probe(struct amba_device *dev,
return ret; return ret;
} }
static int __devexit mmci_remove(struct amba_device *dev) static int mmci_remove(struct amba_device *dev)
{ {
struct mmc_host *mmc = amba_get_drvdata(dev); struct mmc_host *mmc = amba_get_drvdata(dev);
......
...@@ -1478,7 +1478,7 @@ static int mmc_omap_probe(struct platform_device *pdev) ...@@ -1478,7 +1478,7 @@ static int mmc_omap_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit mmc_omap_remove(struct platform_device *pdev) static int mmc_omap_remove(struct platform_device *pdev)
{ {
struct mmc_omap_host *host = platform_get_drvdata(pdev); struct mmc_omap_host *host = platform_get_drvdata(pdev);
int i; int i;
......
...@@ -1986,7 +1986,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) ...@@ -1986,7 +1986,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit omap_hsmmc_remove(struct platform_device *pdev) static int omap_hsmmc_remove(struct platform_device *pdev)
{ {
struct omap_hsmmc_host *host = platform_get_drvdata(pdev); struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
struct resource *res; struct resource *res;
......
...@@ -1819,7 +1819,7 @@ static void s3cmci_shutdown(struct platform_device *pdev) ...@@ -1819,7 +1819,7 @@ static void s3cmci_shutdown(struct platform_device *pdev)
clk_disable(host->clk); clk_disable(host->clk);
} }
static int __devexit s3cmci_remove(struct platform_device *pdev) static int s3cmci_remove(struct platform_device *pdev)
{ {
struct mmc_host *mmc = platform_get_drvdata(pdev); struct mmc_host *mmc = platform_get_drvdata(pdev);
struct s3cmci_host *host = mmc_priv(mmc); struct s3cmci_host *host = mmc_priv(mmc);
......
...@@ -100,7 +100,7 @@ static int sdhci_cns3xxx_probe(struct platform_device *pdev) ...@@ -100,7 +100,7 @@ static int sdhci_cns3xxx_probe(struct platform_device *pdev)
return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata); return sdhci_pltfm_register(pdev, &sdhci_cns3xxx_pdata);
} }
static int __devexit sdhci_cns3xxx_remove(struct platform_device *pdev) static int sdhci_cns3xxx_remove(struct platform_device *pdev)
{ {
return sdhci_pltfm_unregister(pdev); return sdhci_pltfm_unregister(pdev);
} }
......
...@@ -114,7 +114,7 @@ static int sdhci_dove_probe(struct platform_device *pdev) ...@@ -114,7 +114,7 @@ static int sdhci_dove_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit sdhci_dove_remove(struct platform_device *pdev) static int sdhci_dove_remove(struct platform_device *pdev)
{ {
struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
......
...@@ -599,7 +599,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) ...@@ -599,7 +599,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev) static int sdhci_esdhc_imx_remove(struct platform_device *pdev)
{ {
struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
......
...@@ -213,7 +213,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) ...@@ -213,7 +213,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
return sdhci_pltfm_register(pdev, &sdhci_esdhc_pdata); return sdhci_pltfm_register(pdev, &sdhci_esdhc_pdata);
} }
static int __devexit sdhci_esdhc_remove(struct platform_device *pdev) static int sdhci_esdhc_remove(struct platform_device *pdev)
{ {
return sdhci_pltfm_unregister(pdev); return sdhci_pltfm_unregister(pdev);
} }
......
...@@ -71,7 +71,7 @@ static int sdhci_hlwd_probe(struct platform_device *pdev) ...@@ -71,7 +71,7 @@ static int sdhci_hlwd_probe(struct platform_device *pdev)
return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata); return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata);
} }
static int __devexit sdhci_hlwd_remove(struct platform_device *pdev) static int sdhci_hlwd_remove(struct platform_device *pdev)
{ {
return sdhci_pltfm_unregister(pdev); return sdhci_pltfm_unregister(pdev);
} }
......
...@@ -1347,7 +1347,7 @@ static void sdhci_pci_runtime_pm_allow(struct device *dev) ...@@ -1347,7 +1347,7 @@ static void sdhci_pci_runtime_pm_allow(struct device *dev)
pm_suspend_ignore_children(dev, 1); pm_suspend_ignore_children(dev, 1);
} }
static void __devexit sdhci_pci_runtime_pm_forbid(struct device *dev) static void sdhci_pci_runtime_pm_forbid(struct device *dev)
{ {
pm_runtime_forbid(dev); pm_runtime_forbid(dev);
pm_runtime_get_noresume(dev); pm_runtime_get_noresume(dev);
...@@ -1445,7 +1445,7 @@ static int sdhci_pci_probe(struct pci_dev *pdev, ...@@ -1445,7 +1445,7 @@ static int sdhci_pci_probe(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit sdhci_pci_remove(struct pci_dev *pdev) static void sdhci_pci_remove(struct pci_dev *pdev)
{ {
int i; int i;
struct sdhci_pci_chip *chip; struct sdhci_pci_chip *chip;
......
...@@ -247,7 +247,7 @@ static int sdhci_pxav2_probe(struct platform_device *pdev) ...@@ -247,7 +247,7 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit sdhci_pxav2_remove(struct platform_device *pdev) static int sdhci_pxav2_remove(struct platform_device *pdev)
{ {
struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
......
...@@ -313,7 +313,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) ...@@ -313,7 +313,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit sdhci_pxav3_remove(struct platform_device *pdev) static int sdhci_pxav3_remove(struct platform_device *pdev)
{ {
struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
......
...@@ -778,7 +778,7 @@ static int sdhci_s3c_probe(struct platform_device *pdev) ...@@ -778,7 +778,7 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit sdhci_s3c_remove(struct platform_device *pdev) static int sdhci_s3c_remove(struct platform_device *pdev)
{ {
struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_s3c *sc = sdhci_priv(host); struct sdhci_s3c *sc = sdhci_priv(host);
......
...@@ -266,7 +266,7 @@ static int sdhci_probe(struct platform_device *pdev) ...@@ -266,7 +266,7 @@ static int sdhci_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit sdhci_remove(struct platform_device *pdev) static int sdhci_remove(struct platform_device *pdev)
{ {
struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_host *host = platform_get_drvdata(pdev);
struct spear_sdhci *sdhci = dev_get_platdata(&pdev->dev); struct spear_sdhci *sdhci = dev_get_platdata(&pdev->dev);
......
...@@ -370,7 +370,7 @@ static int sdhci_tegra_probe(struct platform_device *pdev) ...@@ -370,7 +370,7 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
return rc; return rc;
} }
static int __devexit sdhci_tegra_remove(struct platform_device *pdev) static int sdhci_tegra_remove(struct platform_device *pdev)
{ {
struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
......
...@@ -1430,7 +1430,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) ...@@ -1430,7 +1430,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit sh_mmcif_remove(struct platform_device *pdev) static int sh_mmcif_remove(struct platform_device *pdev)
{ {
struct sh_mmcif_host *host = platform_get_drvdata(pdev); struct sh_mmcif_host *host = platform_get_drvdata(pdev);
struct sh_mmcif_plat_data *pd = pdev->dev.platform_data; struct sh_mmcif_plat_data *pd = pdev->dev.platform_data;
......
...@@ -107,7 +107,7 @@ static int tmio_mmc_probe(struct platform_device *pdev) ...@@ -107,7 +107,7 @@ static int tmio_mmc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tmio_mmc_remove(struct platform_device *pdev) static int tmio_mmc_remove(struct platform_device *pdev)
{ {
const struct mfd_cell *cell = mfd_get_cell(pdev); const struct mfd_cell *cell = mfd_get_cell(pdev);
struct mmc_host *mmc = platform_get_drvdata(pdev); struct mmc_host *mmc = platform_get_drvdata(pdev);
......
...@@ -1176,7 +1176,7 @@ static int via_sd_probe(struct pci_dev *pcidev, ...@@ -1176,7 +1176,7 @@ static int via_sd_probe(struct pci_dev *pcidev,
return ret; return ret;
} }
static void __devexit via_sd_remove(struct pci_dev *pcidev) static void via_sd_remove(struct pci_dev *pcidev)
{ {
struct via_crdr_mmc_host *sdhost = pci_get_drvdata(pcidev); struct via_crdr_mmc_host *sdhost = pci_get_drvdata(pcidev);
unsigned long flags; unsigned long flags;
......
...@@ -1735,7 +1735,7 @@ static int wbsd_init(struct device *dev, int base, int irq, int dma, ...@@ -1735,7 +1735,7 @@ static int wbsd_init(struct device *dev, int base, int irq, int dma,
return 0; return 0;
} }
static void __devexit wbsd_shutdown(struct device *dev, int pnp) static void wbsd_shutdown(struct device *dev, int pnp)
{ {
struct mmc_host *mmc = dev_get_drvdata(dev); struct mmc_host *mmc = dev_get_drvdata(dev);
struct wbsd_host *host; struct wbsd_host *host;
...@@ -1768,7 +1768,7 @@ static int wbsd_probe(struct platform_device *dev) ...@@ -1768,7 +1768,7 @@ static int wbsd_probe(struct platform_device *dev)
return wbsd_init(&dev->dev, param_io, param_irq, param_dma, 0); return wbsd_init(&dev->dev, param_io, param_irq, param_dma, 0);
} }
static int __devexit wbsd_remove(struct platform_device *dev) static int wbsd_remove(struct platform_device *dev)
{ {
wbsd_shutdown(&dev->dev, 0); wbsd_shutdown(&dev->dev, 0);
...@@ -1801,7 +1801,7 @@ wbsd_pnp_probe(struct pnp_dev *pnpdev, const struct pnp_device_id *dev_id) ...@@ -1801,7 +1801,7 @@ wbsd_pnp_probe(struct pnp_dev *pnpdev, const struct pnp_device_id *dev_id)
return wbsd_init(&pnpdev->dev, io, irq, dma, 1); return wbsd_init(&pnpdev->dev, io, irq, dma, 1);
} }
static void __devexit wbsd_pnp_remove(struct pnp_dev *dev) static void wbsd_pnp_remove(struct pnp_dev *dev)
{ {
wbsd_shutdown(&dev->dev, 1); wbsd_shutdown(&dev->dev, 1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment