Skip to content

Commit

Permalink
mmc: remove use of __devexit
Browse files Browse the repository at this point in the history 
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill 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: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 28, 2012
1 parent 9647f84 commit 6e0ee71
Show file tree
Hide file tree
Showing 27 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion drivers/mmc/host/au1xmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ static int au1xmmc_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/bfin_sdh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ static int sdh_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/cb710-mmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ static int cb710_mmc_init(struct platform_device *pdev)
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 mmc_host *mmc = cb710_slot_to_mmc(slot);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/dw_mmc-pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ static int dw_mci_pci_probe(struct pci_dev *pdev,
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/dw_mmc-pltfm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static int dw_mci_pltfm_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/dw_mmc-pltfm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

extern int dw_mci_pltfm_register(struct platform_device *pdev,
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;

#endif /* _DW_MMC_PLTFM_H_ */
2 changes: 1 addition & 1 deletion drivers/mmc/host/jz4740_mmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ static int jz4740_mmc_probe(struct platform_device* pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/mmc_spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_spi_host *host;
Expand Down
4 changes: 2 additions & 2 deletions drivers/mmc/host/mmci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
static inline void mmci_dma_release(struct mmci_host *host)
Expand Down Expand Up @@ -1522,7 +1522,7 @@ static int mmci_probe(struct amba_device *dev,
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/omap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ static int mmc_omap_probe(struct platform_device *pdev)
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);
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/omap_hsmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1986,7 +1986,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
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 resource *res;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/s3cmci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1819,7 +1819,7 @@ static void s3cmci_shutdown(struct platform_device *pdev)
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 s3cmci_host *host = mmc_priv(mmc);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-cns3xxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static int sdhci_cns3xxx_probe(struct platform_device *pdev)
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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-dove.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static int sdhci_dove_probe(struct platform_device *pdev)
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_pltfm_host *pltfm_host = sdhci_priv(host);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-esdhc-imx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
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_pltfm_host *pltfm_host = sdhci_priv(host);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-of-esdhc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-of-hlwd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static int sdhci_hlwd_probe(struct platform_device *pdev)
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);
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/mmc/host/sdhci-pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ static void sdhci_pci_runtime_pm_allow(struct device *dev)
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_get_noresume(dev);
Expand Down Expand Up @@ -1445,7 +1445,7 @@ static int sdhci_pci_probe(struct pci_dev *pdev,
return ret;
}

static void __devexit sdhci_pci_remove(struct pci_dev *pdev)
static void sdhci_pci_remove(struct pci_dev *pdev)
{
int i;
struct sdhci_pci_chip *chip;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-pxav2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
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_pltfm_host *pltfm_host = sdhci_priv(host);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-pxav3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
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_pltfm_host *pltfm_host = sdhci_priv(host);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-s3c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
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_s3c *sc = sdhci_priv(host);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-spear.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ static int sdhci_probe(struct platform_device *pdev)
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 spear_sdhci *sdhci = dev_get_platdata(&pdev->dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-tegra.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
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_pltfm_host *pltfm_host = sdhci_priv(host);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sh_mmcif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
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_plat_data *pd = pdev->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/tmio_mmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static int tmio_mmc_probe(struct platform_device *pdev)
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);
struct mmc_host *mmc = platform_get_drvdata(pdev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/via-sdmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ static int via_sd_probe(struct pci_dev *pcidev,
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);
unsigned long flags;
Expand Down
6 changes: 3 additions & 3 deletions drivers/mmc/host/wbsd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1735,7 +1735,7 @@ static int wbsd_init(struct device *dev, int base, int irq, int dma,
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 wbsd_host *host;
Expand Down Expand Up @@ -1768,7 +1768,7 @@ static int wbsd_probe(struct platform_device *dev)
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);

Expand Down Expand Up @@ -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);
}

static void __devexit wbsd_pnp_remove(struct pnp_dev *dev)
static void wbsd_pnp_remove(struct pnp_dev *dev)
{
wbsd_shutdown(&dev->dev, 1);
}
Expand Down

0 comments on commit 6e0ee71

Please sign in to comment.