redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mmc: remove use of __devexit_p 

CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
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: 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: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Bill Pemberton 2012-11-19 13:20:26 -05:00 committed by Greg Kroah-Hartman
parent 77f37917a6
commit 0433c14356
23 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mmc/host/bfin_sdh.c
View File

@ -680,7 +680,7 @@ static int sdh_resume(struct platform_device *dev)
static struct platform_driver sdh_driver = {
.probe = sdh_probe,
.remove = __devexit_p(sdh_remove),
.remove = sdh_remove,
.suspend = sdh_suspend,
.resume = sdh_resume,
.driver = {

2
drivers/mmc/host/cb710-mmc.c
View File

@ -773,7 +773,7 @@ static int __devexit cb710_mmc_exit(struct platform_device *pdev)
static struct platform_driver cb710_mmc_driver = {
.driver.name = "cb710-mmc",
.probe = cb710_mmc_init,
.remove = __devexit_p(cb710_mmc_exit),
.remove = cb710_mmc_exit,
#ifdef CONFIG_PM
.suspend = cb710_mmc_suspend,
.resume = cb710_mmc_resume,

2
drivers/mmc/host/jz4740_mmc.c
View File

@ -1004,7 +1004,7 @@ const struct dev_pm_ops jz4740_mmc_pm_ops = {
static struct platform_driver jz4740_mmc_driver = {
.probe = jz4740_mmc_probe,
.remove = __devexit_p(jz4740_mmc_remove),
.remove = jz4740_mmc_remove,
.driver = {
.name = "jz4740-mmc",
.owner = THIS_MODULE,

2
drivers/mmc/host/mmc_spi.c
View File

@ -1529,7 +1529,7 @@ static struct spi_driver mmc_spi_driver = {
.of_match_table = mmc_spi_of_match_table,
},
.probe = mmc_spi_probe,
.remove = __devexit_p(mmc_spi_remove),
.remove = mmc_spi_remove,
};
module_spi_driver(mmc_spi_driver);

2
drivers/mmc/host/mmci.c
View File

@ -1669,7 +1669,7 @@ static struct amba_driver mmci_driver = {
.pm = &mmci_dev_pm_ops,
},
.probe = mmci_probe,
.remove = __devexit_p(mmci_remove),
.remove = mmci_remove,
.id_table = mmci_ids,
};

2
drivers/mmc/host/omap.c
View File

@ -1566,7 +1566,7 @@ static int mmc_omap_resume(struct platform_device *pdev)
static struct platform_driver mmc_omap_driver = {
.probe = mmc_omap_probe,
.remove = __devexit_p(mmc_omap_remove),
.remove = mmc_omap_remove,
.suspend = mmc_omap_suspend,
.resume = mmc_omap_resume,
.driver = {

2
drivers/mmc/host/omap_hsmmc.c
View File

@ -2149,7 +2149,7 @@ static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
static struct platform_driver omap_hsmmc_driver = {
.probe = omap_hsmmc_probe,
.remove = __devexit_p(omap_hsmmc_remove),
.remove = omap_hsmmc_remove,
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,

2
drivers/mmc/host/s3cmci.c
View File

@ -1906,7 +1906,7 @@ static struct platform_driver s3cmci_driver = {
},
.id_table = s3cmci_driver_ids,
.probe = s3cmci_probe,
.remove = __devexit_p(s3cmci_remove),
.remove = s3cmci_remove,
.shutdown = s3cmci_shutdown,
};

2
drivers/mmc/host/sdhci-cns3xxx.c
View File

@ -112,7 +112,7 @@ static struct platform_driver sdhci_cns3xxx_driver = {
.pm = SDHCI_PLTFM_PMOPS,
},
.probe = sdhci_cns3xxx_probe,
.remove = __devexit_p(sdhci_cns3xxx_remove),
.remove = sdhci_cns3xxx_remove,
};
module_platform_driver(sdhci_cns3xxx_driver);

2
drivers/mmc/host/sdhci-dove.c
View File

@ -143,7 +143,7 @@ static struct platform_driver sdhci_dove_driver = {
.of_match_table = of_match_ptr(sdhci_dove_of_match_table),
},
.probe = sdhci_dove_probe,
.remove = __devexit_p(sdhci_dove_remove),
.remove = sdhci_dove_remove,
};
module_platform_driver(sdhci_dove_driver);

2
drivers/mmc/host/sdhci-esdhc-imx.c
View File

@ -637,7 +637,7 @@ static struct platform_driver sdhci_esdhc_imx_driver = {
},
.id_table = imx_esdhc_devtype,
.probe = sdhci_esdhc_imx_probe,
.remove = __devexit_p(sdhci_esdhc_imx_remove),
.remove = sdhci_esdhc_imx_remove,
};
module_platform_driver(sdhci_esdhc_imx_driver);

2
drivers/mmc/host/sdhci-of-esdhc.c
View File

@ -234,7 +234,7 @@ static struct platform_driver sdhci_esdhc_driver = {
.pm = SDHCI_PLTFM_PMOPS,
},
.probe = sdhci_esdhc_probe,
.remove = __devexit_p(sdhci_esdhc_remove),
.remove = sdhci_esdhc_remove,
};
module_platform_driver(sdhci_esdhc_driver);

2
drivers/mmc/host/sdhci-of-hlwd.c
View File

@ -90,7 +90,7 @@ static struct platform_driver sdhci_hlwd_driver = {
.pm = SDHCI_PLTFM_PMOPS,
},
.probe = sdhci_hlwd_probe,
.remove = __devexit_p(sdhci_hlwd_remove),
.remove = sdhci_hlwd_remove,
};
module_platform_driver(sdhci_hlwd_driver);

2
drivers/mmc/host/sdhci-pci.c
View File

@ -1470,7 +1470,7 @@ static struct pci_driver sdhci_driver = {
.name = "sdhci-pci",
.id_table = pci_ids,
.probe = sdhci_pci_probe,
.remove = __devexit_p(sdhci_pci_remove),
.remove = sdhci_pci_remove,
.driver = {
.pm = &sdhci_pci_pm_ops
},

2
drivers/mmc/host/sdhci-pxav2.c
View File

@ -275,7 +275,7 @@ static struct platform_driver sdhci_pxav2_driver = {
.pm = SDHCI_PLTFM_PMOPS,
},
.probe = sdhci_pxav2_probe,
.remove = __devexit_p(sdhci_pxav2_remove),
.remove = sdhci_pxav2_remove,
};
module_platform_driver(sdhci_pxav2_driver);

2
drivers/mmc/host/sdhci-pxav3.c
View File

@ -346,7 +346,7 @@ static struct platform_driver sdhci_pxav3_driver = {
.pm = SDHCI_PLTFM_PMOPS,
},
.probe = sdhci_pxav3_probe,
.remove = __devexit_p(sdhci_pxav3_remove),
.remove = sdhci_pxav3_remove,
};
module_platform_driver(sdhci_pxav3_driver);

2
drivers/mmc/host/sdhci-s3c.c
View File

@ -916,7 +916,7 @@ MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
static struct platform_driver sdhci_s3c_driver = {
.probe = sdhci_s3c_probe,
.remove = __devexit_p(sdhci_s3c_remove),
.remove = sdhci_s3c_remove,
.id_table = sdhci_s3c_driver_ids,
.driver = {
.owner = THIS_MODULE,

2
drivers/mmc/host/sdhci-spear.c
View File

@ -336,7 +336,7 @@ static struct platform_driver sdhci_driver = {
.of_match_table = of_match_ptr(sdhci_spear_id_table),
},
.probe = sdhci_probe,
.remove = __devexit_p(sdhci_remove),
.remove = sdhci_remove,
};
module_platform_driver(sdhci_driver);

2
drivers/mmc/host/sdhci-tegra.c
View File

@ -407,7 +407,7 @@ static struct platform_driver sdhci_tegra_driver = {
.pm = SDHCI_PLTFM_PMOPS,
},
.probe = sdhci_tegra_probe,
.remove = __devexit_p(sdhci_tegra_remove),
.remove = sdhci_tegra_remove,
};
module_platform_driver(sdhci_tegra_driver);

2
drivers/mmc/host/sh_mobile_sdhi.c
View File

@ -330,7 +330,7 @@ static struct platform_driver sh_mobile_sdhi_driver = {
.of_match_table = sh_mobile_sdhi_of_match,
},
.probe = sh_mobile_sdhi_probe,
.remove = __devexit_p(sh_mobile_sdhi_remove),
.remove = sh_mobile_sdhi_remove,
};
module_platform_driver(sh_mobile_sdhi_driver);

2
drivers/mmc/host/tmio_mmc.c
View File

@ -133,7 +133,7 @@ static struct platform_driver tmio_mmc_driver = {
.owner = THIS_MODULE,
},
.probe = tmio_mmc_probe,
.remove = __devexit_p(tmio_mmc_remove),
.remove = tmio_mmc_remove,
.suspend = tmio_mmc_suspend,
.resume = tmio_mmc_resume,
};

2
drivers/mmc/host/via-sdmmc.c
View File

@ -1332,7 +1332,7 @@ static struct pci_driver via_sd_driver = {
.name = DRV_NAME,
.id_table = via_ids,
.probe = via_sd_probe,
.remove = __devexit_p(via_sd_remove),
.remove = via_sd_remove,
.suspend = via_sd_suspend,
.resume = via_sd_resume,
};

4
drivers/mmc/host/wbsd.c
View File

@ -1941,7 +1941,7 @@ static struct platform_device *wbsd_device;
static struct platform_driver wbsd_driver = {
.probe = wbsd_probe,
.remove = __devexit_p(wbsd_remove),
.remove = wbsd_remove,
.suspend = wbsd_platform_suspend,
.resume = wbsd_platform_resume,
@ -1957,7 +1957,7 @@ static struct pnp_driver wbsd_pnp_driver = {
.name = DRIVER_NAME,
.id_table = pnp_dev_table,
.probe = wbsd_pnp_probe,
.remove = __devexit_p(wbsd_pnp_remove),
.remove = wbsd_pnp_remove,
.suspend = wbsd_pnp_suspend,
.resume = wbsd_pnp_resume,