mmc: Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/mmc to use .remove(), with
the eventual goal to drop struct platform_driver::remove_new(). As
.remove() and .remove_new() have the same prototypes, conversion is done
by just changing the structure member name in the driver initializer.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20240927145832.754697-2-u.kleine-koenig@baylibre.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/pwrseq_emmc.c b/drivers/mmc/core/pwrseq_emmc.c
index 96fa4c50890085955be72adbc50db5d8d0dd63ed..35af67e26945135f73c028e364338b3a2ed03c31 100644 (file)
--- a/drivers/mmc/core/pwrseq_emmc.c
+++ b/drivers/mmc/core/pwrseq_emmc.c
@@ -107,7 +107,7 @@ MODULE_DEVICE_TABLE(of, mmc_pwrseq_emmc_of_match);
 
 static struct platform_driver mmc_pwrseq_emmc_driver = {
        .probe = mmc_pwrseq_emmc_probe,
-       .remove_new = mmc_pwrseq_emmc_remove,
+       .remove = mmc_pwrseq_emmc_remove,
        .driver = {
                .name = "pwrseq_emmc",
                .of_match_table = mmc_pwrseq_emmc_of_match,

diff --git a/drivers/mmc/core/pwrseq_sd8787.c b/drivers/mmc/core/pwrseq_sd8787.c
index f24bbd68e25130bfb61de4da93dbe3873ee33cce..30282155a0e11ebf660808b5eba3b847530e3cb8 100644 (file)
--- a/drivers/mmc/core/pwrseq_sd8787.c
+++ b/drivers/mmc/core/pwrseq_sd8787.c
@@ -122,7 +122,7 @@ static void mmc_pwrseq_sd8787_remove(struct platform_device *pdev)
 
 static struct platform_driver mmc_pwrseq_sd8787_driver = {
        .probe = mmc_pwrseq_sd8787_probe,
-       .remove_new = mmc_pwrseq_sd8787_remove,
+       .remove = mmc_pwrseq_sd8787_remove,
        .driver = {
                .name = "pwrseq_sd8787",
                .of_match_table = mmc_pwrseq_sd8787_of_match,

diff --git a/drivers/mmc/core/pwrseq_simple.c b/drivers/mmc/core/pwrseq_simple.c
index 154a8921ae7598334163057c91af407ae97fea22..9e016b0746f509a7bb42590b1dfbb8c41a9129fc 100644 (file)
--- a/drivers/mmc/core/pwrseq_simple.c
+++ b/drivers/mmc/core/pwrseq_simple.c
@@ -151,7 +151,7 @@ static void mmc_pwrseq_simple_remove(struct platform_device *pdev)
 
 static struct platform_driver mmc_pwrseq_simple_driver = {
        .probe = mmc_pwrseq_simple_probe,
-       .remove_new = mmc_pwrseq_simple_remove,
+       .remove = mmc_pwrseq_simple_remove,
        .driver = {
                .name = "pwrseq_simple",
                .of_match_table = mmc_pwrseq_simple_of_match,

diff --git a/drivers/mmc/host/alcor.c b/drivers/mmc/host/alcor.c
index 42aa43740ba86dffb3254b3a8c558438c0b2176c..b6b6dd677ae5b8833a6ac9c7e9a2839af6eac588 100644 (file)
--- a/drivers/mmc/host/alcor.c
+++ b/drivers/mmc/host/alcor.c
@@ -1175,7 +1175,7 @@ MODULE_DEVICE_TABLE(platform, alcor_pci_sdmmc_ids);
 
 static struct platform_driver alcor_pci_sdmmc_driver = {
        .probe          = alcor_pci_sdmmc_drv_probe,
-       .remove_new     = alcor_pci_sdmmc_drv_remove,
+       .remove         = alcor_pci_sdmmc_drv_remove,
        .id_table       = alcor_pci_sdmmc_ids,
        .driver         = {
                .name   = DRV_NAME_ALCOR_PCI_SDMMC,

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index cdbd2edf4b2e7c2bfe76c54b533072a11289182b..204055b3c04239793ce234571a5f8eeb4417deae 100644 (file)
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2653,7 +2653,7 @@ static const struct dev_pm_ops atmci_dev_pm_ops = {
 
 static struct platform_driver atmci_driver = {
        .probe          = atmci_probe,
-       .remove_new     = atmci_remove,
+       .remove         = atmci_remove,
        .driver         = {
                .name           = "atmel_mci",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index 6e80bcb668ecc4908c389ad8fe6d91a14535fc0a..27c666eab5062260a5c78884b57082d0766cac01 100644 (file)
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -1185,7 +1185,7 @@ static int au1xmmc_resume(struct platform_device *pdev)
 
 static struct platform_driver au1xmmc_driver = {
        .probe         = au1xmmc_probe,
-       .remove_new    = au1xmmc_remove,
+       .remove        = au1xmmc_remove,
        .suspend       = au1xmmc_suspend,
        .resume        = au1xmmc_resume,
        .driver        = {

diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index 35d8fdea668b913d723fe021dda3d344d3ba14b5..349f1c50b0967fa5e8e5364db2c4b946b0271f91 100644 (file)
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -1459,7 +1459,7 @@ MODULE_DEVICE_TABLE(of, bcm2835_match);
 
 static struct platform_driver bcm2835_driver = {
        .probe      = bcm2835_probe,
-       .remove_new = bcm2835_remove,
+       .remove     = bcm2835_remove,
        .driver     = {
                .name           = "sdhost-bcm2835",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/cavium-octeon.c b/drivers/mmc/host/cavium-octeon.c
index 060ec4f4800f62470065502e28669aa5ce1183d8..72817c5f4578943015e195f7992470db167fff1b 100644 (file)
--- a/drivers/mmc/host/cavium-octeon.c
+++ b/drivers/mmc/host/cavium-octeon.c
@@ -326,7 +326,7 @@ MODULE_DEVICE_TABLE(of, octeon_mmc_match);
 
 static struct platform_driver octeon_mmc_driver = {
        .probe          = octeon_mmc_probe,
-       .remove_new     = octeon_mmc_remove,
+       .remove         = octeon_mmc_remove,
        .driver         = {
                .name   = KBUILD_MODNAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c
index 902f7f20abaa77b5e04c2bccfd3fb93da9835af9..d741c1f9cf878626accb0d3b4204677e30a8b53f 100644 (file)
--- a/drivers/mmc/host/cb710-mmc.c
+++ b/drivers/mmc/host/cb710-mmc.c
@@ -771,7 +771,7 @@ static void cb710_mmc_exit(struct platform_device *pdev)
 static struct platform_driver cb710_mmc_driver = {
        .driver.name = "cb710-mmc",
        .probe = cb710_mmc_init,
-       .remove_new = cb710_mmc_exit,
+       .remove = cb710_mmc_exit,
 #ifdef CONFIG_PM
        .suspend = cb710_mmc_suspend,
        .resume = cb710_mmc_resume,

diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 9cbde800685d077ad48c030a6492a36a9768362f..7ed533758dbea663b31886d77fd4a5792597ff22 100644 (file)
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -1400,7 +1400,7 @@ static struct platform_driver davinci_mmcsd_driver = {
                .of_match_table = davinci_mmc_dt_ids,
        },
        .probe          = davinci_mmcsd_probe,
-       .remove_new     = davinci_mmcsd_remove,
+       .remove         = davinci_mmcsd_remove,
        .id_table       = davinci_mmc_devtype,
 };
 

diff --git a/drivers/mmc/host/dw_mmc-bluefield.c b/drivers/mmc/host/dw_mmc-bluefield.c
index 24e0b604b4052f06b0232facd8b8d68474687080..3cf526ab0387bdabe9e67ae3028ca463b582a7c2 100644 (file)
--- a/drivers/mmc/host/dw_mmc-bluefield.c
+++ b/drivers/mmc/host/dw_mmc-bluefield.c
@@ -68,7 +68,7 @@ static int dw_mci_bluefield_probe(struct platform_device *pdev)
 
 static struct platform_driver dw_mci_bluefield_pltfm_driver = {
        .probe          = dw_mci_bluefield_probe,
-       .remove_new     = dw_mci_pltfm_remove,
+       .remove         = dw_mci_pltfm_remove,
        .driver         = {
                .name           = "dwmmc_bluefield",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index 6dc057718d2cb8dd3d61802f94a7a905bce3a932..53d32d0f2709e0780ec5f31a3b412f33aaa6baa4 100644 (file)
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -682,7 +682,7 @@ static const struct dev_pm_ops dw_mci_exynos_pmops = {
 
 static struct platform_driver dw_mci_exynos_pltfm_driver = {
        .probe          = dw_mci_exynos_probe,
-       .remove_new     = dw_mci_exynos_remove,
+       .remove         = dw_mci_exynos_remove,
        .driver         = {
                .name           = "dwmmc_exynos",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/dw_mmc-hi3798cv200.c b/drivers/mmc/host/dw_mmc-hi3798cv200.c
index 6099756e59b3c9a7b2bc88e235882041a62cd4ab..0ccfae1b2dbe635c1598af453ee275a82b163a9b 100644 (file)
--- a/drivers/mmc/host/dw_mmc-hi3798cv200.c
+++ b/drivers/mmc/host/dw_mmc-hi3798cv200.c
@@ -189,7 +189,7 @@ static const struct of_device_id dw_mci_hi3798cv200_match[] = {
 MODULE_DEVICE_TABLE(of, dw_mci_hi3798cv200_match);
 static struct platform_driver dw_mci_hi3798cv200_driver = {
        .probe = dw_mci_hi3798cv200_probe,
-       .remove_new = dw_mci_hi3798cv200_remove,
+       .remove = dw_mci_hi3798cv200_remove,
        .driver = {
                .name = "dwmmc_hi3798cv200",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/dw_mmc-hi3798mv200.c b/drivers/mmc/host/dw_mmc-hi3798mv200.c
index 96af693e3e37ce64e8a4dc443306f5717beceda7..cce174b5249bb4ef43960d045b795618cadd15b3 100644 (file)
--- a/drivers/mmc/host/dw_mmc-hi3798mv200.c
+++ b/drivers/mmc/host/dw_mmc-hi3798mv200.c
@@ -237,7 +237,7 @@ static void dw_mci_hi3798mv200_remove(struct platform_device *pdev)
 MODULE_DEVICE_TABLE(of, dw_mci_hi3798mv200_match);
 static struct platform_driver dw_mci_hi3798mv200_driver = {
        .probe = dw_mci_hi3798mv200_probe,
-       .remove_new = dw_mci_hi3798mv200_remove,
+       .remove = dw_mci_hi3798mv200_remove,
        .driver = {
                .name = "dwmmc_hi3798mv200",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c
index e8ee7c43f60b28bff0f7e66036312c52c0c4302e..0311a37dd4abfafdecc5030b992637d550a20b5e 100644 (file)
--- a/drivers/mmc/host/dw_mmc-k3.c
+++ b/drivers/mmc/host/dw_mmc-k3.c
@@ -470,7 +470,7 @@ static const struct dev_pm_ops dw_mci_k3_dev_pm_ops = {
 
 static struct platform_driver dw_mci_k3_pltfm_driver = {
        .probe          = dw_mci_k3_probe,
-       .remove_new     = dw_mci_pltfm_remove,
+       .remove         = dw_mci_pltfm_remove,
        .driver         = {
                .name           = "dwmmc_k3",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index 2353fadceda1181fe0592e5e03dfd005ebe79016..de820ffd21333e61f673469e98a6dcb00b1deb45 100644 (file)
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -131,7 +131,7 @@ EXPORT_SYMBOL_GPL(dw_mci_pltfm_remove);
 
 static struct platform_driver dw_mci_pltfm_driver = {
        .probe          = dw_mci_pltfm_probe,
-       .remove_new     = dw_mci_pltfm_remove,
+       .remove         = dw_mci_pltfm_remove,
        .driver         = {
                .name           = "dw_mmc",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index f96260fd143b4c80102b0096f1d5760c322aff66..baa23b51773127b4137f472581259b61649273a5 100644 (file)
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -577,7 +577,7 @@ static const struct dev_pm_ops dw_mci_rockchip_dev_pm_ops = {
 
 static struct platform_driver dw_mci_rockchip_pltfm_driver = {
        .probe          = dw_mci_rockchip_probe,
-       .remove_new     = dw_mci_rockchip_remove,
+       .remove         = dw_mci_rockchip_remove,
        .driver         = {
                .name           = "dwmmc_rockchip",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/dw_mmc-starfive.c b/drivers/mmc/host/dw_mmc-starfive.c
index b4d81ef0f3af038f6fff5d505cdea2aef1ec47c1..34964b0dab21f30449e16e3208a1bbcdd57d3ea8 100644 (file)
--- a/drivers/mmc/host/dw_mmc-starfive.c
+++ b/drivers/mmc/host/dw_mmc-starfive.c
@@ -115,7 +115,7 @@ static int dw_mci_starfive_probe(struct platform_device *pdev)
 
 static struct platform_driver dw_mci_starfive_driver = {
        .probe = dw_mci_starfive_probe,
-       .remove_new = dw_mci_pltfm_remove,
+       .remove = dw_mci_pltfm_remove,
        .driver = {
                .name = "dwmmc_starfive",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index 6a45991ca056fed54141c2b493514891d0068f3b..596012d5afac8b0fbb00305b6049c8d6de2e4d63 100644 (file)
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -1191,7 +1191,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,
 
 static struct platform_driver jz4740_mmc_driver = {
        .probe = jz4740_mmc_probe,
-       .remove_new = jz4740_mmc_remove,
+       .remove = jz4740_mmc_remove,
        .driver = {
                .name = "jz4740-mmc",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/litex_mmc.c b/drivers/mmc/host/litex_mmc.c
index 4ec8072dc60b3da083a9d4723beb39fc65a2a454..b338ccfa8f3378affa3666853febec69b66ea56f 100644 (file)
--- a/drivers/mmc/host/litex_mmc.c
+++ b/drivers/mmc/host/litex_mmc.c
@@ -644,7 +644,7 @@ MODULE_DEVICE_TABLE(of, litex_match);
 
 static struct platform_driver litex_mmc_driver = {
        .probe = litex_mmc_probe,
-       .remove_new = litex_mmc_remove,
+       .remove = litex_mmc_remove,
        .driver = {
                .name = "litex-mmc",
                .of_match_table = litex_match,

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index c7c067b9415a41db7ea30223e15b772a6a02a058..a9e7c8ddc5a132add59d2ca021bbdcc3073ccf47 100644 (file)
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -1334,7 +1334,7 @@ MODULE_DEVICE_TABLE(of, meson_mmc_of_match);
 
 static struct platform_driver meson_mmc_driver = {
        .probe          = meson_mmc_probe,
-       .remove_new     = meson_mmc_remove,
+       .remove         = meson_mmc_remove,
        .driver         = {
                .name = DRIVER_NAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/meson-mx-sdhc-mmc.c b/drivers/mmc/host/meson-mx-sdhc-mmc.c
index 31f750301dc1324e230cd485bdcc2d511356a858..b4e56ccffca2c3d33fb74d67d76b3a1e3b3975d3 100644 (file)
--- a/drivers/mmc/host/meson-mx-sdhc-mmc.c
+++ b/drivers/mmc/host/meson-mx-sdhc-mmc.c
@@ -904,7 +904,7 @@ MODULE_DEVICE_TABLE(of, meson_mx_sdhc_of_match);
 
 static struct platform_driver meson_mx_sdhc_driver = {
        .probe   = meson_mx_sdhc_probe,
-       .remove_new = meson_mx_sdhc_remove,
+       .remove = meson_mx_sdhc_remove,
        .driver  = {
                .name = "meson-mx-sdhc",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/meson-mx-sdio.c b/drivers/mmc/host/meson-mx-sdio.c
index a11577f2ee69bdeb65e778f1057e1cfd6193e8ec..ad351805eed40a6a0fc86dc39c1d3e66871f703e 100644 (file)
--- a/drivers/mmc/host/meson-mx-sdio.c
+++ b/drivers/mmc/host/meson-mx-sdio.c
@@ -754,7 +754,7 @@ MODULE_DEVICE_TABLE(of, meson_mx_mmc_of_match);
 
 static struct platform_driver meson_mx_mmc_driver = {
        .probe   = meson_mx_mmc_probe,
-       .remove_new = meson_mx_mmc_remove,
+       .remove = meson_mx_mmc_remove,
        .driver  = {
                .name = "meson-mx-sdio",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c
index 8ede4ce9327149b87eef0df976081644d982b80c..a12048e5de63a69eaba3e17f46e32e4fa67245c1 100644 (file)
--- a/drivers/mmc/host/moxart-mmc.c
+++ b/drivers/mmc/host/moxart-mmc.c
@@ -719,7 +719,7 @@ MODULE_DEVICE_TABLE(of, moxart_mmc_match);
 
 static struct platform_driver moxart_mmc_driver = {
        .probe      = moxart_probe,
-       .remove_new = moxart_remove,
+       .remove = moxart_remove,
        .driver     = {
                .name           = "mmc-moxart",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 89018b6c97b9a7bdfc0f9ca9168be76ed600ca7b..1a0f6b04d863637c6455436a324c20d68411132b 100644 (file)
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -3112,7 +3112,7 @@ static const struct dev_pm_ops msdc_dev_pm_ops = {
 
 static struct platform_driver mt_msdc_driver = {
        .probe = msdc_drv_probe,
-       .remove_new = msdc_drv_remove,
+       .remove = msdc_drv_remove,
        .driver = {
                .name = "mtk-msdc",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 12df4ff9eeee5319dcc9ed1dffd02001023c8dae..b92f3ba38663b74c38683662b7ccffced97a8eef 100644 (file)
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -819,7 +819,7 @@ MODULE_DEVICE_TABLE(of, mvsdio_dt_ids);
 
 static struct platform_driver mvsd_driver = {
        .probe          = mvsd_probe,
-       .remove_new     = mvsd_remove,
+       .remove         = mvsd_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 1edf652913541e92d7ac53a01291e56c87b5121f..e7a286c3216fdbfcf278ef143d85216892566639 100644 (file)
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -1225,7 +1225,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);
 
 static struct platform_driver mxcmci_driver = {
        .probe          = mxcmci_probe,
-       .remove_new     = mxcmci_remove,
+       .remove         = mxcmci_remove,
        .driver         = {
                .name           = DRIVER_NAME,
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 6751da9b60f964e77d26ddad830689054a2c6806..80e6f48c83aa0502af5567b642e171f45466132e 100644 (file)
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -714,7 +714,7 @@ static SIMPLE_DEV_PM_OPS(mxs_mmc_pm_ops, mxs_mmc_suspend, mxs_mmc_resume);
 
 static struct platform_driver mxs_mmc_driver = {
        .probe          = mxs_mmc_probe,
-       .remove_new     = mxs_mmc_remove,
+       .remove         = mxs_mmc_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 335350a4e99aba1ad34fceba0da3a54b51b3064f..62252ad4e20de1bacb414157a382213fd3c6166d 100644 (file)
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1554,7 +1554,7 @@ MODULE_DEVICE_TABLE(of, mmc_omap_match);
 
 static struct platform_driver mmc_omap_driver = {
        .probe          = mmc_omap_probe,
-       .remove_new     = mmc_omap_remove,
+       .remove         = mmc_omap_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index e120aeb869b89202eeb6f9c6347d540b17df7ba0..59e36e0ebbbf74e0e247f5e465909902c1128ab5 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2121,7 +2121,7 @@ static const struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
 
 static struct platform_driver omap_hsmmc_driver = {
        .probe          = omap_hsmmc_probe,
-       .remove_new     = omap_hsmmc_remove,
+       .remove         = omap_hsmmc_remove,
        .driver         = {
                .name = DRIVER_NAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/owl-mmc.c b/drivers/mmc/host/owl-mmc.c
index fc08f25c34eb6d5e5054747a60712910ab59bcc0..797ef48d9204e4c2b50dffbbee220d33438dc0af 100644 (file)
--- a/drivers/mmc/host/owl-mmc.c
+++ b/drivers/mmc/host/owl-mmc.c
@@ -692,7 +692,7 @@ static struct platform_driver owl_mmc_driver = {
                .of_match_table = owl_mmc_of_match,
        },
        .probe          = owl_mmc_probe,
-       .remove_new     = owl_mmc_remove,
+       .remove         = owl_mmc_remove,
 };
 module_platform_driver(owl_mmc_driver);
 

diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index fae3192c3a142cd50f87dddda80b961c2edf6547..2d0ad006913d5b6d528c7cfe2d5169c7af29dd2b 100644 (file)
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -810,7 +810,7 @@ static void pxamci_remove(struct platform_device *pdev)
 
 static struct platform_driver pxamci_driver = {
        .probe          = pxamci_probe,
-       .remove_new     = pxamci_remove,
+       .remove         = pxamci_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index 1dcaa050f26486c35832f172d34ea9da64905489..4b389e92399e822e25dbcb8bb1509101d5e79aa8 100644 (file)
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -613,7 +613,7 @@ static struct platform_driver renesas_internal_dmac_sdhi_driver = {
                .of_match_table = renesas_sdhi_internal_dmac_of_match,
        },
        .probe          = renesas_sdhi_internal_dmac_probe,
-       .remove_new     = renesas_sdhi_remove,
+       .remove         = renesas_sdhi_remove,
 };
 
 module_platform_driver(renesas_internal_dmac_sdhi_driver);

diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
index 0ba3f62a9b4919fb75dc8453acc38018810b9c7e..822a310c9bbaed7c27f344a20bbb866f668ac649 100644 (file)
--- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c
@@ -471,7 +471,7 @@ static struct platform_driver renesas_sys_dmac_sdhi_driver = {
                .of_match_table = renesas_sdhi_sys_dmac_of_match,
        },
        .probe          = renesas_sdhi_sys_dmac_probe,
-       .remove_new     = renesas_sdhi_remove,
+       .remove         = renesas_sdhi_remove,
 };
 
 module_platform_driver(renesas_sys_dmac_sdhi_driver);

diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index 20e79109be16d6a3e71e2afdae2bb76b1109466c..48d3b0aae5a00191387a9fec692e769010d5bbe8 100644 (file)
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -1591,7 +1591,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_pci_sdmmc_ids);
 
 static struct platform_driver rtsx_pci_sdmmc_driver = {
        .probe          = rtsx_pci_sdmmc_drv_probe,
-       .remove_new     = rtsx_pci_sdmmc_drv_remove,
+       .remove         = rtsx_pci_sdmmc_drv_remove,
        .id_table       = rtsx_pci_sdmmc_ids,
        .driver         = {
                .name   = DRV_NAME_RTSX_PCI_SDMMC,

diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c
index 4e86f0a705b60a984f2b314c8316146a13642705..107c78df53cf407fbbdc67b07315806755609dff 100644 (file)
--- a/drivers/mmc/host/rtsx_usb_sdmmc.c
+++ b/drivers/mmc/host/rtsx_usb_sdmmc.c
@@ -1453,7 +1453,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_usb_sdmmc_ids);
 
 static struct platform_driver rtsx_usb_sdmmc_driver = {
        .probe          = rtsx_usb_sdmmc_drv_probe,
-       .remove_new     = rtsx_usb_sdmmc_drv_remove,
+       .remove         = rtsx_usb_sdmmc_drv_remove,
        .id_table       = rtsx_usb_sdmmc_ids,
        .driver         = {
                .name   = "rtsx_usb_sdmmc",

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index eb8f427f9770d52106b84d8882d41f56b065d5fb..d1ce9193ece934a8dd4d82a5e0585ed220297e2c 100644 (file)
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -1080,7 +1080,7 @@ static struct platform_driver sdhci_acpi_driver = {
                .pm                     = &sdhci_acpi_pm_ops,
        },
        .probe  = sdhci_acpi_probe,
-       .remove_new = sdhci_acpi_remove,
+       .remove = sdhci_acpi_remove,
 };
 
 module_platform_driver(sdhci_acpi_driver);

diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index e067c7f5c5372144416ab0293a9aa90cdc6b24f4..fda911fb28e5afb546278454ba6916ddb99e9207 100644 (file)
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -328,7 +328,7 @@ static struct platform_driver sdhci_bcm_kona_driver = {
                .of_match_table = sdhci_bcm_kona_of_match,
        },
        .probe          = sdhci_bcm_kona_probe,
-       .remove_new     = sdhci_bcm_kona_remove,
+       .remove         = sdhci_bcm_kona_remove,
 };
 module_platform_driver(sdhci_bcm_kona_driver);
 

diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
index 031a4b514d16bd8b660254c088876342f2168395..0ef4d578ade849162cf6fc704a4dd537a25760aa 100644 (file)
--- a/drivers/mmc/host/sdhci-brcmstb.c
+++ b/drivers/mmc/host/sdhci-brcmstb.c
@@ -545,7 +545,7 @@ static struct platform_driver sdhci_brcmstb_driver = {
                .of_match_table = of_match_ptr(sdhci_brcm_of_match),
        },
        .probe          = sdhci_brcmstb_probe,
-       .remove_new     = sdhci_pltfm_remove,
+       .remove         = sdhci_pltfm_remove,
        .shutdown       = sdhci_brcmstb_shutdown,
 };
 

diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c
index be1505e8c536e8473511b98b9d59f3bb1f3b7c04..a94b297fcf2a34b5b91d324319bfc6496ba25751 100644 (file)
--- a/drivers/mmc/host/sdhci-cadence.c
+++ b/drivers/mmc/host/sdhci-cadence.c
@@ -608,7 +608,7 @@ static struct platform_driver sdhci_cdns_driver = {
                .of_match_table = sdhci_cdns_match,
        },
        .probe = sdhci_cdns_probe,
-       .remove_new = sdhci_pltfm_remove,
+       .remove = sdhci_pltfm_remove,
 };
 module_platform_driver(sdhci_cdns_driver);
 

diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
index 88ec23417808b259d585959262e4a3e1e0963b59..77034b13fa66ae3594a5f00cdc30d9c79fc6bd45 100644 (file)
--- a/drivers/mmc/host/sdhci-dove.c
+++ b/drivers/mmc/host/sdhci-dove.c
@@ -106,7 +106,7 @@ static struct platform_driver sdhci_dove_driver = {
                .of_match_table = sdhci_dove_of_match_table,
        },
        .probe          = sdhci_dove_probe,
-       .remove_new     = sdhci_pltfm_remove,
+       .remove         = sdhci_pltfm_remove,
 };
 
 module_platform_driver(sdhci_dove_driver);

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index ef3a44f2dff16d6025adc94d6fd6e9e60bc023da..fea994da8bf8b838fd64a298adb3db06958f5f4f 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -2021,7 +2021,7 @@ static struct platform_driver sdhci_esdhc_imx_driver = {
                .pm     = &sdhci_esdhc_pmops,
        },
        .probe          = sdhci_esdhc_imx_probe,
-       .remove_new     = sdhci_esdhc_imx_remove,
+       .remove         = sdhci_esdhc_imx_remove,
 };
 
 module_platform_driver(sdhci_esdhc_imx_driver);

diff --git a/drivers/mmc/host/sdhci-esdhc-mcf.c b/drivers/mmc/host/sdhci-esdhc-mcf.c
index 3ad87322f6a5536872c11645c0820c9afb03a453..327662ba5bd93037d502de8f2db3d2d4cb7c6dc6 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-mcf.c
+++ b/drivers/mmc/host/sdhci-esdhc-mcf.c
@@ -512,7 +512,7 @@ static struct platform_driver sdhci_esdhc_mcf_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
        .probe = sdhci_esdhc_mcf_probe,
-       .remove_new = sdhci_esdhc_mcf_remove,
+       .remove = sdhci_esdhc_mcf_remove,
 };
 
 module_platform_driver(sdhci_esdhc_mcf_driver);

diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
index 10235fdff246f6a6d9937c2199db48badc7226d4..80b2567a488bffb562004826f7f91f78f072a102 100644 (file)
--- a/drivers/mmc/host/sdhci-iproc.c
+++ b/drivers/mmc/host/sdhci-iproc.c
@@ -424,7 +424,7 @@ static struct platform_driver sdhci_iproc_driver = {
                .pm = &sdhci_pltfm_pmops,
        },
        .probe = sdhci_iproc_probe,
-       .remove_new = sdhci_pltfm_remove,
+       .remove = sdhci_pltfm_remove,
        .shutdown = sdhci_iproc_shutdown,
 };
 module_platform_driver(sdhci_iproc_driver);

diff --git a/drivers/mmc/host/sdhci-milbeaut.c b/drivers/mmc/host/sdhci-milbeaut.c
index 83706edc9796893146e7aebd286e4d5fda0f221a..a4675456f9c78399eef421da508bd64db409344c 100644 (file)
--- a/drivers/mmc/host/sdhci-milbeaut.c
+++ b/drivers/mmc/host/sdhci-milbeaut.c
@@ -335,7 +335,7 @@ static struct platform_driver sdhci_milbeaut_driver = {
                .of_match_table = mlb_dt_ids,
        },
        .probe  = sdhci_milbeaut_probe,
-       .remove_new = sdhci_milbeaut_remove,
+       .remove = sdhci_milbeaut_remove,
 };
 
 module_platform_driver(sdhci_milbeaut_driver);

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index e113b99a3eab592dfdd24bbd6c371c2756c2b6c9..8dd180a42f72d58b2a1343f6e65dd552a092bc06 100644 (file)
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -2753,7 +2753,7 @@ static const struct dev_pm_ops sdhci_msm_pm_ops = {
 
 static struct platform_driver sdhci_msm_driver = {
        .probe = sdhci_msm_probe,
-       .remove_new = sdhci_msm_remove,
+       .remove = sdhci_msm_remove,
        .driver = {
                   .name = "sdhci_msm",
                   .of_match_table = sdhci_msm_dt_match,

diff --git a/drivers/mmc/host/sdhci-npcm.c b/drivers/mmc/host/sdhci-npcm.c
index 5bf9d18f364e411da128b68d22ba0b1c88ae9a08..bee0585ba5c13110062415f22ced639508afc034 100644 (file)
--- a/drivers/mmc/host/sdhci-npcm.c
+++ b/drivers/mmc/host/sdhci-npcm.c
@@ -85,7 +85,7 @@ static struct platform_driver npcm_sdhci_driver = {
                .pm     = &sdhci_pltfm_pmops,
        },
        .probe          = npcm_sdhci_probe,
-       .remove_new     = sdhci_pltfm_remove,
+       .remove         = sdhci_pltfm_remove,
 };
 module_platform_driver(npcm_sdhci_driver);
 

diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index 5edd024347bd5d48f1ecd919e46ba5a2df1dbfa0..5eacc78e2620ba2e0d673851ffa855214c2e42e8 100644 (file)
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -2046,7 +2046,7 @@ static struct platform_driver sdhci_arasan_driver = {
                .pm = &sdhci_arasan_dev_pm_ops,
        },
        .probe = sdhci_arasan_probe,
-       .remove_new = sdhci_arasan_remove,
+       .remove = sdhci_arasan_remove,
 };
 
 module_platform_driver(sdhci_arasan_driver);

diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
index 37240895ffaafc4eaf9fbed69007fec613f8bdcb..d6de010551b9346a5672ef91bb88fad7c7d1d66b 100644 (file)
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -519,7 +519,7 @@ static struct platform_driver aspeed_sdhci_driver = {
                .of_match_table = aspeed_sdhci_of_match,
        },
        .probe          = aspeed_sdhci_probe,
-       .remove_new     = aspeed_sdhci_remove,
+       .remove         = aspeed_sdhci_remove,
 };
 
 static int aspeed_sdc_probe(struct platform_device *pdev)
@@ -596,7 +596,7 @@ static struct platform_driver aspeed_sdc_driver = {
                .of_match_table = aspeed_sdc_of_match,
        },
        .probe          = aspeed_sdc_probe,
-       .remove_new     = aspeed_sdc_remove,
+       .remove         = aspeed_sdc_remove,
 };
 
 #if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)

diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
index 23a9faad2ff81d68883a6bc67b3cb085787b2d56..97988ed374672371d0df931a6250f03a506a02d1 100644 (file)
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -471,7 +471,7 @@ static struct platform_driver sdhci_at91_driver = {
                .pm     = &sdhci_at91_dev_pm_ops,
        },
        .probe          = sdhci_at91_probe,
-       .remove_new     = sdhci_at91_remove,
+       .remove         = sdhci_at91_remove,
 };
 
 module_platform_driver(sdhci_at91_driver);

diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c
index 8fd80dac11bfdf4da44ff7bf5b3eb549b1caebd7..7ea3da45db326d32b6b21fab52425c97966bd13a 100644 (file)
--- a/drivers/mmc/host/sdhci-of-dwcmshc.c
+++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
@@ -1626,7 +1626,7 @@ static struct platform_driver sdhci_dwcmshc_driver = {
                .pm = &dwcmshc_pmops,
        },
        .probe  = dwcmshc_probe,
-       .remove_new = dwcmshc_remove,
+       .remove = dwcmshc_remove,
 };
 module_platform_driver(sdhci_dwcmshc_driver);
 

diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index 3ae9aa25745ae01c764aeefb56c35d9ae2f9455c..002d0d59b9926d5687b395612481ec1482a46f9b 100644 (file)
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -1521,7 +1521,7 @@ static struct platform_driver sdhci_esdhc_driver = {
                .pm = &esdhc_of_dev_pm_ops,
        },
        .probe = sdhci_esdhc_probe,
-       .remove_new = sdhci_pltfm_remove,
+       .remove = sdhci_pltfm_remove,
 };
 
 module_platform_driver(sdhci_esdhc_driver);

diff --git a/drivers/mmc/host/sdhci-of-hlwd.c b/drivers/mmc/host/sdhci-of-hlwd.c
index 9c1c0ce610efcdbc5f9dc04faa97db4b694ed36c..5bb845d13599c66bbe6dd40a0ca2531ccf3ed984 100644 (file)
--- a/drivers/mmc/host/sdhci-of-hlwd.c
+++ b/drivers/mmc/host/sdhci-of-hlwd.c
@@ -85,7 +85,7 @@ static struct platform_driver sdhci_hlwd_driver = {
                .pm = &sdhci_pltfm_pmops,
        },
        .probe = sdhci_hlwd_probe,
-       .remove_new = sdhci_pltfm_remove,
+       .remove = sdhci_pltfm_remove,
 };
 
 module_platform_driver(sdhci_hlwd_driver);

diff --git a/drivers/mmc/host/sdhci-of-ma35d1.c b/drivers/mmc/host/sdhci-of-ma35d1.c
index b84c2927bd4ade3a99df1f824d3a834110175c60..1e6d180100ad46805f52e24be8aae31199653b4d 100644 (file)
--- a/drivers/mmc/host/sdhci-of-ma35d1.c
+++ b/drivers/mmc/host/sdhci-of-ma35d1.c
@@ -305,7 +305,7 @@ static struct platform_driver sdhci_ma35_driver = {
                .of_match_table = sdhci_ma35_dt_ids,
        },
        .probe  = ma35_probe,
-       .remove_new = ma35_remove,
+       .remove = ma35_remove,
 };
 module_platform_driver(sdhci_ma35_driver);
 

diff --git a/drivers/mmc/host/sdhci-of-sparx5.c b/drivers/mmc/host/sdhci-of-sparx5.c
index 64b77e7d14cdbd044c1d49d0f745ee6393d754a2..d2aa684e786f4d2d3c0fd53a0dd28d39ee2b2b1f 100644 (file)
--- a/drivers/mmc/host/sdhci-of-sparx5.c
+++ b/drivers/mmc/host/sdhci-of-sparx5.c
@@ -255,7 +255,7 @@ static struct platform_driver sdhci_sparx5_driver = {
                .pm = &sdhci_pltfm_pmops,
        },
        .probe = sdhci_sparx5_probe,
-       .remove_new = sdhci_pltfm_remove,
+       .remove = sdhci_pltfm_remove,
 };
 
 module_platform_driver(sdhci_sparx5_driver);

diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
index 5841a9afeb9f500792280ce762747694a1acb19d..54d795205fb443ecf16f89a0a4938156e305a696 100644 (file)
--- a/drivers/mmc/host/sdhci-omap.c
+++ b/drivers/mmc/host/sdhci-omap.c
@@ -1478,7 +1478,7 @@ static const struct dev_pm_ops sdhci_omap_dev_pm_ops = {
 
 static struct platform_driver sdhci_omap_driver = {
        .probe = sdhci_omap_probe,
-       .remove_new = sdhci_omap_remove,
+       .remove = sdhci_omap_remove,
        .driver = {
                   .name = "sdhci-omap",
                   .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/sdhci-pic32.c b/drivers/mmc/host/sdhci-pic32.c
index 7a0351a9c74e6b175693fa387492fea544026ba1..d6a299f499006504c770f2bade28b56e8d7bc3b7 100644 (file)
--- a/drivers/mmc/host/sdhci-pic32.c
+++ b/drivers/mmc/host/sdhci-pic32.c
@@ -236,7 +236,7 @@ static struct platform_driver pic32_sdhci_driver = {
                .of_match_table = of_match_ptr(pic32_sdhci_id_table),
        },
        .probe          = pic32_sdhci_probe,
-       .remove_new     = pic32_sdhci_remove,
+       .remove         = pic32_sdhci_remove,
 };
 
 module_platform_driver(pic32_sdhci_driver);

diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index 7b957f6d55884a59440fa5cae6dbe80febde60a2..45b6f0891c47e606e0f39df0bc9968b60d851a22 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -351,7 +351,7 @@ static struct platform_driver sdhci_pxav2_driver = {
                .pm     = &sdhci_pltfm_pmops,
        },
        .probe          = sdhci_pxav2_probe,
-       .remove_new     = sdhci_pltfm_remove,
+       .remove         = sdhci_pltfm_remove,
 };
 
 module_platform_driver(sdhci_pxav2_driver);

diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 3af43ac05825528297f263c0b2a113999905aed6..990723a008aec52df0ae2330a445583b69f8bda3 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -568,7 +568,7 @@ static struct platform_driver sdhci_pxav3_driver = {
                .pm     = &sdhci_pxav3_pmops,
        },
        .probe          = sdhci_pxav3_probe,
-       .remove_new     = sdhci_pxav3_remove,
+       .remove         = sdhci_pxav3_remove,
 };
 
 module_platform_driver(sdhci_pxav3_driver);

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index a71d56c7031ffad03b6565de0b4c4d806d2c94ad..bdf4dc0d6b77b8196171b8a2b1f3bd00a93043e6 100644 (file)
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -774,7 +774,7 @@ MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
 
 static struct platform_driver sdhci_s3c_driver = {
        .probe          = sdhci_s3c_probe,
-       .remove_new     = sdhci_s3c_remove,
+       .remove         = sdhci_s3c_remove,
        .id_table       = sdhci_s3c_driver_ids,
        .driver         = {
                .name   = "s3c-sdhci",

diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index c81bdfa97b891eb014f714f0a6d6e0c76d9b9b69..770dc12b9ae92d1c020ea05a9189aa20d855b043 100644 (file)
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -182,7 +182,7 @@ static struct platform_driver sdhci_driver = {
                .of_match_table = sdhci_spear_id_table,
        },
        .probe          = sdhci_probe,
-       .remove_new     = sdhci_remove,
+       .remove         = sdhci_remove,
 };
 
 module_platform_driver(sdhci_driver);

diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
index 8776f42871196b9155696dc6b5bac33c8ff448a0..db5e253b0f79187ad017fcdb999da57a3de3dea0 100644 (file)
--- a/drivers/mmc/host/sdhci-sprd.c
+++ b/drivers/mmc/host/sdhci-sprd.c
@@ -975,7 +975,7 @@ static const struct dev_pm_ops sdhci_sprd_pm_ops = {
 
 static struct platform_driver sdhci_sprd_driver = {
        .probe = sdhci_sprd_probe,
-       .remove_new = sdhci_sprd_remove,
+       .remove = sdhci_sprd_remove,
        .driver = {
                .name = "sdhci_sprd_r11",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c
index d12532b96b51125732fe93340edc8dfc8daae2bf..4973e08a98f87380325566a6b18878dd45e1dc30 100644 (file)
--- a/drivers/mmc/host/sdhci-st.c
+++ b/drivers/mmc/host/sdhci-st.c
@@ -507,7 +507,7 @@ MODULE_DEVICE_TABLE(of, st_sdhci_match);
 
 static struct platform_driver sdhci_st_driver = {
        .probe = sdhci_st_probe,
-       .remove_new = sdhci_st_remove,
+       .remove = sdhci_st_remove,
        .driver = {
                   .name = "sdhci-st",
                   .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 1ad0a6b3a2eb7746613c407cd8a245ed45a58729..4d402b601883657bfe70708656e7260daeba47a6 100644 (file)
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -1930,7 +1930,7 @@ static struct platform_driver sdhci_tegra_driver = {
                .pm     = &sdhci_tegra_dev_pm_ops,
        },
        .probe          = sdhci_tegra_probe,
-       .remove_new     = sdhci_tegra_remove,
+       .remove         = sdhci_tegra_remove,
 };
 
 module_platform_driver(sdhci_tegra_driver);

diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index 0e52867f6e91cfc312135365051bce10ad2648c1..098f0ea45cbe29bbb06fb15623dfe67cc8f91a30 100644 (file)
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -734,7 +734,7 @@ static struct platform_driver sdhci_xenon_driver = {
                .pm = &sdhci_xenon_dev_pm_ops,
        },
        .probe  = xenon_probe,
-       .remove_new = xenon_remove,
+       .remove = xenon_remove,
 };
 
 module_platform_driver(sdhci_xenon_driver);

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 9ff07aadb2d911260bcb0e206f4dbd2b3be17ac7..b73f673db92bbc042392995e715815e15ace6005 100644 (file)
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -1130,7 +1130,7 @@ static struct platform_driver sdhci_am654_driver = {
                .of_match_table = sdhci_am654_of_match,
        },
        .probe = sdhci_am654_probe,
-       .remove_new = sdhci_am654_remove,
+       .remove = sdhci_am654_remove,
 };
 
 module_platform_driver(sdhci_am654_driver);

diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
index c58e7cb1e2a79eda5468c9417f68d442392166ae..ee66e4f3683d2770b56991b81c8a47f4f54403ae 100644 (file)
--- a/drivers/mmc/host/sdhci_f_sdh30.c
+++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -247,7 +247,7 @@ static struct platform_driver sdhci_f_sdh30_driver = {
                .pm     = &sdhci_pltfm_pmops,
        },
        .probe = sdhci_f_sdh30_probe,
-       .remove_new = sdhci_f_sdh30_remove,
+       .remove = sdhci_f_sdh30_remove,
 };
 
 module_platform_driver(sdhci_f_sdh30_driver);

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 08b4312af94ec8f4b42802519cc4ae61b9a20228..864e345a39f6322e5db8b379f8733c64941f77ec 100644 (file)
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1596,7 +1596,7 @@ static const struct dev_pm_ops sh_mmcif_dev_pm_ops = {
 
 static struct platform_driver sh_mmcif_driver = {
        .probe          = sh_mmcif_probe,
-       .remove_new     = sh_mmcif_remove,
+       .remove         = sh_mmcif_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/sunplus-mmc.c b/drivers/mmc/host/sunplus-mmc.c
index 13c7cc0b6180a795566f312660a18aca73f0db8a..1cddea615a27075640ab39feeb7e97ffd6c66782 100644 (file)
--- a/drivers/mmc/host/sunplus-mmc.c
+++ b/drivers/mmc/host/sunplus-mmc.c
@@ -982,7 +982,7 @@ MODULE_DEVICE_TABLE(of, spmmc_of_table);
 
 static struct platform_driver spmmc_driver = {
        .probe = spmmc_drv_probe,
-       .remove_new = spmmc_drv_remove,
+       .remove = spmmc_drv_remove,
        .driver = {
                .name = "spmmc",
                .pm = pm_ptr(&spmmc_pm_ops),

diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index d3bd0ac99ec4688aee0dad7136794ad0138dda71..564f5fefe62a3a440b2d28227eae75973955fffc 100644 (file)
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1554,7 +1554,7 @@ static struct platform_driver sunxi_mmc_driver = {
                .pm = &sunxi_mmc_pm_ops,
        },
        .probe          = sunxi_mmc_probe,
-       .remove_new     = sunxi_mmc_remove,
+       .remove         = sunxi_mmc_remove,
 };
 module_platform_driver(sunxi_mmc_driver);
 

diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c
index 46ee8a0b2b85637504ace3f4a4bbf49b50bce7c1..4ad02cfdc23897d7006beae020734a61c1a22d1f 100644 (file)
--- a/drivers/mmc/host/uniphier-sd.c
+++ b/drivers/mmc/host/uniphier-sd.c
@@ -754,7 +754,7 @@ MODULE_DEVICE_TABLE(of, uniphier_sd_match);
 
 static struct platform_driver uniphier_sd_driver = {
        .probe = uniphier_sd_probe,
-       .remove_new = uniphier_sd_remove,
+       .remove = uniphier_sd_remove,
        .driver = {
                .name = "uniphier-sd",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c
index 6e421445d56c94251321ef638baef705576d9abe..49efb960a052bbab092257331884e75a290d34c7 100644 (file)
--- a/drivers/mmc/host/usdhi6rol0.c
+++ b/drivers/mmc/host/usdhi6rol0.c
@@ -1899,7 +1899,7 @@ static void usdhi6_remove(struct platform_device *pdev)
 
 static struct platform_driver usdhi6_driver = {
        .probe          = usdhi6_probe,
-       .remove_new     = usdhi6_remove,
+       .remove         = usdhi6_remove,
        .driver         = {
                .name   = "usdhi6rol0",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index 6e20405d04300e63e20db38da5e79ceec1a218d6..8b268e8a0ec9e796e78c3bcbcd830cb840169eba 100644 (file)
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -1896,7 +1896,7 @@ static struct platform_device *wbsd_device;
 
 static struct platform_driver wbsd_driver = {
        .probe          = wbsd_probe,
-       .remove_new     = wbsd_remove,
+       .remove         = wbsd_remove,
        .suspend        = wbsd_platform_suspend,
        .resume         = wbsd_platform_resume,
        .driver         = {

diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
index 860380931b6cde736a9e57ccdaee20e877c0b182..cdb36a9f9e38e01ed1d9a952153422c1bf4032a9 100644 (file)
--- a/drivers/mmc/host/wmt-sdmmc.c
+++ b/drivers/mmc/host/wmt-sdmmc.c
@@ -982,7 +982,7 @@ static const struct dev_pm_ops wmt_mci_pm = {
 
 static struct platform_driver wmt_mci_driver = {
        .probe = wmt_mci_probe,
-       .remove_new = wmt_mci_remove,
+       .remove = wmt_mci_remove,
        .driver = {
                .name = DRIVER_NAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,