mtd: 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/mtd 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>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20241007205803.444994-10-u.kleine-koenig@baylibre.com

diff --git a/drivers/mtd/devices/bcm47xxsflash.c b/drivers/mtd/devices/bcm47xxsflash.c
index 74f559b..2edc467 100644 (file)
--- a/drivers/mtd/devices/bcm47xxsflash.c
+++ b/drivers/mtd/devices/bcm47xxsflash.c
@@ -367,7 +367,7 @@ static void bcm47xxsflash_bcma_remove(struct platform_device *pdev)
 
 static struct platform_driver bcma_sflash_driver = {
        .probe  = bcm47xxsflash_bcma_probe,
-       .remove_new = bcm47xxsflash_bcma_remove,
+       .remove = bcm47xxsflash_bcma_remove,
        .driver = {
                .name = "bcma_sflash",
        },

diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index a2b643a..c93769c 100644 (file)
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -2075,7 +2075,7 @@ static struct platform_driver g3_driver = {
        },
        .suspend        = docg3_suspend,
        .resume         = docg3_resume,
-       .remove_new     = docg3_release,
+       .remove         = docg3_release,
 };
 
 module_platform_driver_probe(g3_driver, docg3_probe);

diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 1bf192f..f756c60 100644 (file)
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -399,7 +399,7 @@ static void phram_remove(struct platform_device *pdev)
 
 static struct platform_driver phram_driver = {
        .probe          = phram_probe,
-       .remove_new     = phram_remove,
+       .remove         = phram_remove,
        .driver         = {
                .name           = "phram",
                .of_match_table = of_match_ptr(phram_of_match),

diff --git a/drivers/mtd/devices/powernv_flash.c b/drivers/mtd/devices/powernv_flash.c
index 10cd1d9..a12427d 100644 (file)
--- a/drivers/mtd/devices/powernv_flash.c
+++ b/drivers/mtd/devices/powernv_flash.c
@@ -286,7 +286,7 @@ static struct platform_driver powernv_flash_driver = {
                .name           = "powernv_flash",
                .of_match_table = powernv_flash_match,
        },
-       .remove_new     = powernv_flash_release,
+       .remove         = powernv_flash_release,
        .probe          = powernv_flash_probe,
 };
 

diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 1574296..f02f96b 100644 (file)
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -1093,7 +1093,7 @@ static struct platform_driver spear_smi_driver = {
                .pm = &spear_smi_pm_ops,
        },
        .probe = spear_smi_probe,
-       .remove_new = spear_smi_remove,
+       .remove = spear_smi_remove,
 };
 module_platform_driver(spear_smi_driver);
 

diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
index 3268de5..dba584f 100644 (file)
--- a/drivers/mtd/devices/st_spi_fsm.c
+++ b/drivers/mtd/devices/st_spi_fsm.c
@@ -2132,7 +2132,7 @@ MODULE_DEVICE_TABLE(of, stfsm_match);
 
 static struct platform_driver stfsm_driver = {
        .probe          = stfsm_probe,
-       .remove_new     = stfsm_remove,
+       .remove         = stfsm_remove,
        .driver         = {
                .name   = "st-spi-fsm",
                .of_match_table = stfsm_match,

diff --git a/drivers/mtd/hyperbus/hbmc-am654.c b/drivers/mtd/hyperbus/hbmc-am654.c
index dbe3eb3..217f4e6 100644 (file)
--- a/drivers/mtd/hyperbus/hbmc-am654.c
+++ b/drivers/mtd/hyperbus/hbmc-am654.c
@@ -254,7 +254,7 @@ MODULE_DEVICE_TABLE(of, am654_hbmc_dt_ids);
 
 static struct platform_driver am654_hbmc_platform_driver = {
        .probe = am654_hbmc_probe,
-       .remove_new = am654_hbmc_remove,
+       .remove = am654_hbmc_remove,
        .driver = {
                .name = "hbmc-am654",
                .of_match_table = am654_hbmc_dt_ids,

diff --git a/drivers/mtd/hyperbus/rpc-if.c b/drivers/mtd/hyperbus/rpc-if.c
index e7a28f3..f448e23 100644 (file)
--- a/drivers/mtd/hyperbus/rpc-if.c
+++ b/drivers/mtd/hyperbus/rpc-if.c
@@ -171,7 +171,7 @@ MODULE_DEVICE_TABLE(platform, rpc_if_hyperflash_id_table);
 
 static struct platform_driver rpcif_platform_driver = {
        .probe  = rpcif_hb_probe,
-       .remove_new = rpcif_hb_remove,
+       .remove = rpcif_hb_remove,
        .id_table = rpc_if_hyperflash_id_table,
        .driver = {
                .name   = "rpc-if-hyperflash",

diff --git a/drivers/mtd/lpddr/lpddr2_nvm.c b/drivers/mtd/lpddr/lpddr2_nvm.c
index 9169e11..565b71f 100644 (file)
--- a/drivers/mtd/lpddr/lpddr2_nvm.c
+++ b/drivers/mtd/lpddr/lpddr2_nvm.c
@@ -487,7 +487,7 @@ static struct platform_driver lpddr2_nvm_drv = {
                .name   = "lpddr2_nvm",
        },
        .probe          = lpddr2_nvm_probe,
-       .remove_new     = lpddr2_nvm_remove,
+       .remove         = lpddr2_nvm_remove,
 };
 
 module_platform_driver(lpddr2_nvm_drv);

diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index 124b13c..80d467e 100644 (file)
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -184,7 +184,7 @@ MODULE_DEVICE_TABLE(of, ltq_mtd_match);
 
 static struct platform_driver ltq_mtd_driver = {
        .probe = ltq_mtd_probe,
-       .remove_new = ltq_mtd_remove,
+       .remove = ltq_mtd_remove,
        .driver = {
                .name = "ltq-nor",
                .of_match_table = ltq_mtd_match,

diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index 96eb2e7..2bd7a1a 100644 (file)
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -621,7 +621,7 @@ static void physmap_flash_shutdown(struct platform_device *dev)
 
 static struct platform_driver physmap_flash_driver = {
        .probe          = physmap_flash_probe,
-       .remove_new     = physmap_flash_remove,
+       .remove         = physmap_flash_remove,
        .shutdown       = physmap_flash_shutdown,
        .driver         = {
                .name   = "physmap-flash",

diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index 8b736f0..1c541ea 100644 (file)
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -205,7 +205,7 @@ MODULE_ALIAS("platform:mtd-ram");
 
 static struct platform_driver platram_driver = {
        .probe          = platram_probe,
-       .remove_new     = platram_remove,
+       .remove         = platram_remove,
        .driver         = {
                .name   = "mtd-ram",
        },

diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index f2a2d47..f27c25d 100644 (file)
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -128,7 +128,7 @@ static struct platform_driver pxa2xx_flash_driver = {
                .name           = "pxa2xx-flash",
        },
        .probe          = pxa2xx_flash_probe,
-       .remove_new     = pxa2xx_flash_remove,
+       .remove         = pxa2xx_flash_remove,
        .shutdown       = pxa2xx_flash_shutdown,
 };
 

diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index ac8a0a1..6a54a84 100644 (file)
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -293,7 +293,7 @@ static void sa1100_mtd_remove(struct platform_device *pdev)
 
 static struct platform_driver sa1100_mtd_driver = {
        .probe          = sa1100_mtd_probe,
-       .remove_new     = sa1100_mtd_remove,
+       .remove         = sa1100_mtd_remove,
        .driver         = {
                .name   = "sa1100-mtd",
        },

diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index b69dade..ea3aa02 100644 (file)
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -149,7 +149,7 @@ static struct platform_driver uflash_driver = {
                .of_match_table = uflash_match,
        },
        .probe          = uflash_probe,
-       .remove_new     = uflash_remove,
+       .remove         = uflash_remove,
 };
 
 module_platform_driver(uflash_driver);

diff --git a/drivers/mtd/nand/ecc-mxic.c b/drivers/mtd/nand/ecc-mxic.c
index 47e1094..9f79c2d 100644 (file)
--- a/drivers/mtd/nand/ecc-mxic.c
+++ b/drivers/mtd/nand/ecc-mxic.c
@@ -869,7 +869,7 @@ static struct platform_driver mxic_ecc_driver = {
                .of_match_table = mxic_ecc_of_ids,
        },
        .probe = mxic_ecc_probe,
-       .remove_new = mxic_ecc_remove,
+       .remove = mxic_ecc_remove,
 };
 module_platform_driver(mxic_ecc_driver);
 

diff --git a/drivers/mtd/nand/onenand/generic.c b/drivers/mtd/nand/onenand/generic.c
index 4e7de48..4e6fd1c 100644 (file)
--- a/drivers/mtd/nand/onenand/generic.c
+++ b/drivers/mtd/nand/onenand/generic.c
@@ -104,7 +104,7 @@ static struct platform_driver generic_onenand_driver = {
                .name           = DRIVER_NAME,
        },
        .probe          = generic_onenand_probe,
-       .remove_new     = generic_onenand_remove,
+       .remove         = generic_onenand_remove,
 };
 
 module_platform_driver(generic_onenand_driver);

diff --git a/drivers/mtd/nand/onenand/onenand_omap2.c b/drivers/mtd/nand/onenand/onenand_omap2.c
index a12f8f3..f9a386b 100644 (file)
--- a/drivers/mtd/nand/onenand/onenand_omap2.c
+++ b/drivers/mtd/nand/onenand/onenand_omap2.c
@@ -593,7 +593,7 @@ MODULE_DEVICE_TABLE(of, omap2_onenand_id_table);
 
 static struct platform_driver omap2_onenand_driver = {
        .probe          = omap2_onenand_probe,
-       .remove_new     = omap2_onenand_remove,
+       .remove         = omap2_onenand_remove,
        .shutdown       = omap2_onenand_shutdown,
        .driver         = {
                .name   = DRIVER_NAME,

diff --git a/drivers/mtd/nand/onenand/onenand_samsung.c b/drivers/mtd/nand/onenand/onenand_samsung.c
index fd6890a..f37a613 100644 (file)
--- a/drivers/mtd/nand/onenand/onenand_samsung.c
+++ b/drivers/mtd/nand/onenand/onenand_samsung.c
@@ -991,7 +991,7 @@ static struct platform_driver s3c_onenand_driver = {
        },
        .id_table       = s3c_onenand_driver_ids,
        .probe          = s3c_onenand_probe,
-       .remove_new     = s3c_onenand_remove,
+       .remove         = s3c_onenand_remove,
 };
 
 module_platform_driver(s3c_onenand_driver);

diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c
index 919816a..fb2b7db 100644 (file)
--- a/drivers/mtd/nand/raw/ams-delta.c
+++ b/drivers/mtd/nand/raw/ams-delta.c
@@ -432,7 +432,7 @@ MODULE_DEVICE_TABLE(platform, gpio_nand_plat_id_table);
 
 static struct platform_driver gpio_nand_driver = {
        .probe          = gpio_nand_probe,
-       .remove_new     = gpio_nand_remove,
+       .remove         = gpio_nand_remove,
        .id_table       = gpio_nand_plat_id_table,
        .driver         = {
                .name   = "ams-delta-nand",

diff --git a/drivers/mtd/nand/raw/arasan-nand-controller.c b/drivers/mtd/nand/raw/arasan-nand-controller.c
index 5436ec4..db42aa0 100644 (file)
--- a/drivers/mtd/nand/raw/arasan-nand-controller.c
+++ b/drivers/mtd/nand/raw/arasan-nand-controller.c
@@ -1500,7 +1500,7 @@ static struct platform_driver anfc_driver = {
                .of_match_table = anfc_ids,
        },
        .probe = anfc_probe,
-       .remove_new = anfc_remove,
+       .remove = anfc_remove,
 };
 module_platform_driver(anfc_driver);
 

diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index f9ccfd0..dedcca8 100644 (file)
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -2663,7 +2663,7 @@ static struct platform_driver atmel_nand_controller_driver = {
                .pm = &atmel_nand_controller_pm_ops,
        },
        .probe = atmel_nand_controller_probe,
-       .remove_new = atmel_nand_controller_remove,
+       .remove = atmel_nand_controller_remove,
 };
 module_platform_driver(atmel_nand_controller_driver);
 

diff --git a/drivers/mtd/nand/raw/au1550nd.c b/drivers/mtd/nand/raw/au1550nd.c
index 063a5e0..04d6472 100644 (file)
--- a/drivers/mtd/nand/raw/au1550nd.c
+++ b/drivers/mtd/nand/raw/au1550nd.c
@@ -357,7 +357,7 @@ static struct platform_driver au1550nd_driver = {
                .name   = "au1550-nand",
        },
        .probe          = au1550nd_probe,
-       .remove_new     = au1550nd_remove,
+       .remove         = au1550nd_remove,
 };
 
 module_platform_driver(au1550nd_driver);

diff --git a/drivers/mtd/nand/raw/bcm47xxnflash/main.c b/drivers/mtd/nand/raw/bcm47xxnflash/main.c
index ebcf508..4d4e185 100644 (file)
--- a/drivers/mtd/nand/raw/bcm47xxnflash/main.c
+++ b/drivers/mtd/nand/raw/bcm47xxnflash/main.c
@@ -70,7 +70,7 @@ static void bcm47xxnflash_remove(struct platform_device *pdev)
 
 static struct platform_driver bcm47xxnflash_driver = {
        .probe  = bcm47xxnflash_probe,
-       .remove_new = bcm47xxnflash_remove,
+       .remove = bcm47xxnflash_remove,
        .driver = {
                .name = "bcma_nflash",
        },

diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
index 05b7b65..a06cd87 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@@ -117,7 +117,7 @@ MODULE_DEVICE_TABLE(of, bcm6368_nand_of_match);
 
 static struct platform_driver bcm6368_nand_driver = {
        .probe                  = bcm6368_nand_probe,
-       .remove_new             = brcmnand_remove,
+       .remove                 = brcmnand_remove,
        .driver = {
                .name           = "bcm6368_nand",
                .pm             = &brcmnand_pm_ops,

diff --git a/drivers/mtd/nand/raw/brcmnand/bcma_nand.c b/drivers/mtd/nand/raw/brcmnand/bcma_nand.c
index 4e7e435..dd27977 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/bcma_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcma_nand.c
@@ -119,7 +119,7 @@ static int brcmnand_bcma_nand_probe(struct platform_device *pdev)
 
 static struct platform_driver brcmnand_bcma_nand_driver = {
        .probe                  = brcmnand_bcma_nand_probe,
-       .remove_new             = brcmnand_remove,
+       .remove                 = brcmnand_remove,
        .driver = {
                .name           = "bcma_brcmnand",
                .pm             = &brcmnand_pm_ops,

diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
index ea53485..c31d7f3 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
@@ -112,7 +112,7 @@ MODULE_DEVICE_TABLE(of, bcmbca_nand_of_match);
 
 static struct platform_driver bcmbca_nand_driver = {
        .probe                  = bcmbca_nand_probe,
-       .remove_new             = brcmnand_remove,
+       .remove                 = brcmnand_remove,
        .driver = {
                .name           = "bcmbca_nand",
                .pm             = &brcmnand_pm_ops,

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c b/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
index 558f083..950923d 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c
@@ -23,7 +23,7 @@ static int brcmstb_nand_probe(struct platform_device *pdev)
 
 static struct platform_driver brcmstb_nand_driver = {
        .probe                  = brcmstb_nand_probe,
-       .remove_new             = brcmnand_remove,
+       .remove                 = brcmnand_remove,
        .driver = {
                .name           = "brcmstb_nand",
                .pm             = &brcmnand_pm_ops,

diff --git a/drivers/mtd/nand/raw/brcmnand/iproc_nand.c b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
index bf46c8b..089c70f 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
@@ -134,7 +134,7 @@ MODULE_DEVICE_TABLE(of, iproc_nand_of_match);
 
 static struct platform_driver iproc_nand_driver = {
        .probe                  = iproc_nand_probe,
-       .remove_new             = brcmnand_remove,
+       .remove                 = brcmnand_remove,
        .driver = {
                .name           = "iproc_nand",
                .pm             = &brcmnand_pm_ops,

diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
index 3bc89b3..a6a1657 100644 (file)
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -3055,7 +3055,7 @@ static void cadence_nand_dt_remove(struct platform_device *ofdev)
 
 static struct platform_driver cadence_nand_dt_driver = {
        .probe          = cadence_nand_dt_probe,
-       .remove_new     = cadence_nand_dt_remove,
+       .remove         = cadence_nand_dt_remove,
        .driver         = {
                .name   = "cadence-nand-controller",
                .of_match_table = cadence_nand_dt_ids,

diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index 3926781..634bdd5 100644 (file)
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -901,7 +901,7 @@ static void nand_davinci_remove(struct platform_device *pdev)
 
 static struct platform_driver nand_davinci_driver = {
        .probe          = nand_davinci_probe,
-       .remove_new     = nand_davinci_remove,
+       .remove         = nand_davinci_remove,
        .driver         = {
                .name   = "davinci_nand",
                .of_match_table = of_match_ptr(davinci_nand_of_match),

diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c
index 2f56665..e0dd59b 100644 (file)
--- a/drivers/mtd/nand/raw/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
@@ -225,7 +225,7 @@ static void denali_dt_remove(struct platform_device *pdev)
 
 static struct platform_driver denali_dt_driver = {
        .probe          = denali_dt_probe,
-       .remove_new     = denali_dt_remove,
+       .remove         = denali_dt_remove,
        .driver         = {
                .name   = "denali-nand-dt",
                .of_match_table = denali_nand_dt_ids,

diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index df6a0d5..03dbe37 100644 (file)
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -999,7 +999,7 @@ static struct platform_driver fsl_elbc_nand_driver = {
                .of_match_table = fsl_elbc_nand_match,
        },
        .probe = fsl_elbc_nand_probe,
-       .remove_new = fsl_elbc_nand_remove,
+       .remove = fsl_elbc_nand_remove,
 };
 
 module_platform_driver(fsl_elbc_nand_driver);

diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index f0e2318..7be95d0 100644 (file)
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -1130,7 +1130,7 @@ static struct platform_driver fsl_ifc_nand_driver = {
                .of_match_table = fsl_ifc_nand_match,
        },
        .probe       = fsl_ifc_nand_probe,
-       .remove_new  = fsl_ifc_nand_remove,
+       .remove      = fsl_ifc_nand_remove,
 };
 
 module_platform_driver(fsl_ifc_nand_driver);

diff --git a/drivers/mtd/nand/raw/fsl_upm.c b/drivers/mtd/nand/raw/fsl_upm.c
index 315e9d2..f4dc990 100644 (file)
--- a/drivers/mtd/nand/raw/fsl_upm.c
+++ b/drivers/mtd/nand/raw/fsl_upm.c
@@ -259,7 +259,7 @@ static struct platform_driver of_fun_driver = {
                .of_match_table = of_fun_match,
        },
        .probe          = fun_probe,
-       .remove_new     = fun_remove,
+       .remove         = fun_remove,
 };
 
 module_platform_driver(of_fun_driver);

diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 811982d..d579d5d 100644 (file)
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -1221,7 +1221,7 @@ static const struct of_device_id fsmc_nand_id_table[] = {
 MODULE_DEVICE_TABLE(of, fsmc_nand_id_table);
 
 static struct platform_driver fsmc_nand_driver = {
-       .remove_new = fsmc_nand_remove,
+       .remove = fsmc_nand_remove,
        .driver = {
                .name = "fsmc-nand",
                .of_match_table = fsmc_nand_id_table,

diff --git a/drivers/mtd/nand/raw/gpio.c b/drivers/mtd/nand/raw/gpio.c
index d6cc2cb..69e5e43 100644 (file)
--- a/drivers/mtd/nand/raw/gpio.c
+++ b/drivers/mtd/nand/raw/gpio.c
@@ -392,7 +392,7 @@ out_ce:
 
 static struct platform_driver gpio_nand_driver = {
        .probe          = gpio_nand_probe,
-       .remove_new     = gpio_nand_remove,
+       .remove         = gpio_nand_remove,
        .driver         = {
                .name   = "gpio-nand",
                .of_match_table = of_match_ptr(gpio_nand_id_table),

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index e1b5153..706a5d7 100644 (file)
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -2876,8 +2876,8 @@ static struct platform_driver gpmi_nand_driver = {
                .pm = &gpmi_pm_ops,
                .of_match_table = gpmi_nand_id_table,
        },
-       .probe   = gpmi_nand_probe,
-       .remove_new = gpmi_nand_remove,
+       .probe = gpmi_nand_probe,
+       .remove = gpmi_nand_remove,
 };
 module_platform_driver(gpmi_nand_driver);
 

diff --git a/drivers/mtd/nand/raw/hisi504_nand.c b/drivers/mtd/nand/raw/hisi504_nand.c
index fe291a2..d97270e 100644 (file)
--- a/drivers/mtd/nand/raw/hisi504_nand.c
+++ b/drivers/mtd/nand/raw/hisi504_nand.c
@@ -858,7 +858,7 @@ static struct platform_driver hisi_nfc_driver = {
                .pm = &hisi_nfc_pm_ops,
        },
        .probe          = hisi_nfc_probe,
-       .remove_new     = hisi_nfc_remove,
+       .remove         = hisi_nfc_remove,
 };
 
 module_platform_driver(hisi_nfc_driver);

diff --git a/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c b/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
index 0e7dd9c..47dc3ef 100644 (file)
--- a/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
+++ b/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
@@ -549,7 +549,7 @@ MODULE_DEVICE_TABLE(of, ingenic_nand_dt_match);
 
 static struct platform_driver ingenic_nand_driver = {
        .probe          = ingenic_nand_probe,
-       .remove_new     = ingenic_nand_remove,
+       .remove         = ingenic_nand_remove,
        .driver = {
                .name   = DRV_NAME,
                .of_match_table = ingenic_nand_dt_match,

diff --git a/drivers/mtd/nand/raw/intel-nand-controller.c b/drivers/mtd/nand/raw/intel-nand-controller.c
index 78174c4..c68847f 100644 (file)
--- a/drivers/mtd/nand/raw/intel-nand-controller.c
+++ b/drivers/mtd/nand/raw/intel-nand-controller.c
@@ -728,7 +728,7 @@ MODULE_DEVICE_TABLE(of, ebu_nand_match);
 
 static struct platform_driver ebu_nand_driver = {
        .probe = ebu_nand_probe,
-       .remove_new = ebu_nand_remove,
+       .remove = ebu_nand_remove,
        .driver = {
                .name = "intel-nand-controller",
                .of_match_table = ebu_nand_match,

diff --git a/drivers/mtd/nand/raw/lpc32xx_mlc.c b/drivers/mtd/nand/raw/lpc32xx_mlc.c
index b9c3adc..19b13ae 100644 (file)
--- a/drivers/mtd/nand/raw/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_mlc.c
@@ -891,7 +891,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_nand_match);
 
 static struct platform_driver lpc32xx_nand_driver = {
        .probe          = lpc32xx_nand_probe,
-       .remove_new     = lpc32xx_nand_remove,
+       .remove         = lpc32xx_nand_remove,
        .resume         = pm_ptr(lpc32xx_nand_resume),
        .suspend        = pm_ptr(lpc32xx_nand_suspend),
        .driver         = {

diff --git a/drivers/mtd/nand/raw/lpc32xx_slc.c b/drivers/mtd/nand/raw/lpc32xx_slc.c
index ade971e..b54d765 100644 (file)
--- a/drivers/mtd/nand/raw/lpc32xx_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_slc.c
@@ -1010,7 +1010,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_nand_match);
 
 static struct platform_driver lpc32xx_nand_driver = {
        .probe          = lpc32xx_nand_probe,
-       .remove_new     = lpc32xx_nand_remove,
+       .remove         = lpc32xx_nand_remove,
        .resume         = pm_ptr(lpc32xx_nand_resume),
        .suspend        = pm_ptr(lpc32xx_nand_suspend),
        .driver         = {

diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index 26648b7..e461473 100644 (file)
--- a/drivers/mtd/nand/raw/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -3183,7 +3183,7 @@ static struct platform_driver marvell_nfc_driver = {
        },
        .id_table = marvell_nfc_platform_ids,
        .probe = marvell_nfc_probe,
-       .remove_new = marvell_nfc_remove,
+       .remove = marvell_nfc_remove,
 };
 module_platform_driver(marvell_nfc_driver);
 

diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index fbb06aa..b8834aa 100644 (file)
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -1621,7 +1621,7 @@ static void meson_nfc_remove(struct platform_device *pdev)
 
 static struct platform_driver meson_nfc_driver = {
        .probe  = meson_nfc_probe,
-       .remove_new = meson_nfc_remove,
+       .remove = meson_nfc_remove,
        .driver = {
                .name  = "meson-nand",
                .of_match_table = meson_nfc_id_table,

diff --git a/drivers/mtd/nand/raw/mpc5121_nfc.c b/drivers/mtd/nand/raw/mpc5121_nfc.c
index 215610f..97b4e7f 100644 (file)
--- a/drivers/mtd/nand/raw/mpc5121_nfc.c
+++ b/drivers/mtd/nand/raw/mpc5121_nfc.c
@@ -835,7 +835,7 @@ MODULE_DEVICE_TABLE(of, mpc5121_nfc_match);
 
 static struct platform_driver mpc5121_nfc_driver = {
        .probe          = mpc5121_nfc_probe,
-       .remove_new     = mpc5121_nfc_remove,
+       .remove         = mpc5121_nfc_remove,
        .driver         = {
                .name = DRV_NAME,
                .of_match_table = mpc5121_nfc_match,

diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c
index 586868b..21c7e11 100644 (file)
--- a/drivers/mtd/nand/raw/mtk_nand.c
+++ b/drivers/mtd/nand/raw/mtk_nand.c
@@ -1640,7 +1640,7 @@ static SIMPLE_DEV_PM_OPS(mtk_nfc_pm_ops, mtk_nfc_suspend, mtk_nfc_resume);
 
 static struct platform_driver mtk_nfc_driver = {
        .probe  = mtk_nfc_probe,
-       .remove_new = mtk_nfc_remove,
+       .remove = mtk_nfc_remove,
        .driver = {
                .name  = MTK_NAME,
                .of_match_table = mtk_nfc_id_table,

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 7368081..8c56b68 100644 (file)
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -1824,7 +1824,7 @@ static struct platform_driver mxcnd_driver = {
                   .of_match_table = mxcnd_dt_ids,
        },
        .probe = mxcnd_probe,
-       .remove_new = mxcnd_remove,
+       .remove = mxcnd_remove,
 };
 module_platform_driver(mxcnd_driver);
 

diff --git a/drivers/mtd/nand/raw/mxic_nand.c b/drivers/mtd/nand/raw/mxic_nand.c
index be8050e..92de266 100644 (file)
--- a/drivers/mtd/nand/raw/mxic_nand.c
+++ b/drivers/mtd/nand/raw/mxic_nand.c
@@ -574,7 +574,7 @@ MODULE_DEVICE_TABLE(of, mxic_nfc_of_ids);
 
 static struct platform_driver mxic_nfc_driver = {
        .probe = mxic_nfc_probe,
-       .remove_new = mxic_nfc_remove,
+       .remove = mxic_nfc_remove,
        .driver = {
                .name = "mxic-nfc",
                .of_match_table = mxic_nfc_of_ids,

diff --git a/drivers/mtd/nand/raw/ndfc.c b/drivers/mtd/nand/raw/ndfc.c
index 3bb32a7..1336512 100644 (file)
--- a/drivers/mtd/nand/raw/ndfc.c
+++ b/drivers/mtd/nand/raw/ndfc.c
@@ -266,7 +266,7 @@ static struct platform_driver ndfc_driver = {
                .of_match_table = ndfc_match,
        },
        .probe = ndfc_probe,
-       .remove_new = ndfc_remove,
+       .remove = ndfc_remove,
 };
 
 module_platform_driver(ndfc_driver);

diff --git a/drivers/mtd/nand/raw/omap2.c b/drivers/mtd/nand/raw/omap2.c
index cf76afc..d9141f3 100644 (file)
--- a/drivers/mtd/nand/raw/omap2.c
+++ b/drivers/mtd/nand/raw/omap2.c
@@ -2291,7 +2291,7 @@ MODULE_DEVICE_TABLE(of, omap_nand_ids);
 
 static struct platform_driver omap_nand_driver = {
        .probe          = omap_nand_probe,
-       .remove_new     = omap_nand_remove,
+       .remove         = omap_nand_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .of_match_table = omap_nand_ids,

diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c
index 4a97d4a..c1d19b8 100644 (file)
--- a/drivers/mtd/nand/raw/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
@@ -560,7 +560,7 @@ static struct platform_driver elm_driver = {
                .pm     = &elm_pm_ops,
        },
        .probe  = elm_probe,
-       .remove_new = elm_remove,
+       .remove = elm_remove,
 };
 
 module_platform_driver(elm_driver);

diff --git a/drivers/mtd/nand/raw/orion_nand.c b/drivers/mtd/nand/raw/orion_nand.c
index 2951d81..47e80d5 100644 (file)
--- a/drivers/mtd/nand/raw/orion_nand.c
+++ b/drivers/mtd/nand/raw/orion_nand.c
@@ -214,7 +214,7 @@ MODULE_DEVICE_TABLE(of, orion_nand_of_match_table);
 #endif
 
 static struct platform_driver orion_nand_driver = {
-       .remove_new     = orion_nand_remove,
+       .remove         = orion_nand_remove,
        .driver         = {
                .name   = "orion_nand",
                .of_match_table = of_match_ptr(orion_nand_of_match_table),

diff --git a/drivers/mtd/nand/raw/pasemi_nand.c b/drivers/mtd/nand/raw/pasemi_nand.c
index 19b2c9d..0b1f767 100644 (file)
--- a/drivers/mtd/nand/raw/pasemi_nand.c
+++ b/drivers/mtd/nand/raw/pasemi_nand.c
@@ -237,7 +237,7 @@ static struct platform_driver pasemi_nand_driver =
                .of_match_table = pasemi_nand_match,
        },
        .probe          = pasemi_nand_probe,
-       .remove_new     = pasemi_nand_remove,
+       .remove         = pasemi_nand_remove,
 };
 
 module_platform_driver(pasemi_nand_driver);

diff --git a/drivers/mtd/nand/raw/pl35x-nand-controller.c b/drivers/mtd/nand/raw/pl35x-nand-controller.c
index 2570fd0..46b2a6b 100644 (file)
--- a/drivers/mtd/nand/raw/pl35x-nand-controller.c
+++ b/drivers/mtd/nand/raw/pl35x-nand-controller.c
@@ -1184,7 +1184,7 @@ MODULE_DEVICE_TABLE(of, pl35x_nand_of_match);
 
 static struct platform_driver pl35x_nandc_driver = {
        .probe = pl35x_nand_probe,
-       .remove_new = pl35x_nand_remove,
+       .remove = pl35x_nand_remove,
        .driver = {
                .name = PL35X_NANDC_DRIVER_NAME,
                .of_match_table = pl35x_nand_of_match,

diff --git a/drivers/mtd/nand/raw/plat_nand.c b/drivers/mtd/nand/raw/plat_nand.c
index b5c374b..0bcd455 100644 (file)
--- a/drivers/mtd/nand/raw/plat_nand.c
+++ b/drivers/mtd/nand/raw/plat_nand.c
@@ -144,7 +144,7 @@ MODULE_DEVICE_TABLE(of, plat_nand_match);
 
 static struct platform_driver plat_nand_driver = {
        .probe  = plat_nand_probe,
-       .remove_new = plat_nand_remove,
+       .remove = plat_nand_remove,
        .driver = {
                .name           = "gen_nand",
                .of_match_table = plat_nand_match,

diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index b8cff92..636bba2 100644 (file)
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -3535,8 +3535,8 @@ static struct platform_driver qcom_nandc_driver = {
                .name = "qcom-nandc",
                .of_match_table = qcom_nandc_of_match,
        },
-       .probe   = qcom_nandc_probe,
-       .remove_new = qcom_nandc_remove,
+       .probe = qcom_nandc_probe,
+       .remove = qcom_nandc_remove,
 };
 module_platform_driver(qcom_nandc_driver);
 

diff --git a/drivers/mtd/nand/raw/renesas-nand-controller.c b/drivers/mtd/nand/raw/renesas-nand-controller.c
index 0e92d50..44f6603 100644 (file)
--- a/drivers/mtd/nand/raw/renesas-nand-controller.c
+++ b/drivers/mtd/nand/raw/renesas-nand-controller.c
@@ -1402,7 +1402,7 @@ static struct platform_driver rnandc_driver = {
                .of_match_table = rnandc_id_table,
        },
        .probe = rnandc_probe,
-       .remove_new = rnandc_remove,
+       .remove = rnandc_remove,
 };
 module_platform_driver(rnandc_driver);
 

diff --git a/drivers/mtd/nand/raw/rockchip-nand-controller.c b/drivers/mtd/nand/raw/rockchip-nand-controller.c
index 51c9cf9..63e7b9e 100644 (file)
--- a/drivers/mtd/nand/raw/rockchip-nand-controller.c
+++ b/drivers/mtd/nand/raw/rockchip-nand-controller.c
@@ -1477,7 +1477,7 @@ static const struct dev_pm_ops rk_nfc_pm_ops = {
 
 static struct platform_driver rk_nfc_driver = {
        .probe = rk_nfc_probe,
-       .remove_new = rk_nfc_remove,
+       .remove = rk_nfc_remove,
        .driver = {
                .name = "rockchip-nfc",
                .of_match_table = rk_nfc_id_table,

diff --git a/drivers/mtd/nand/raw/s3c2410.c b/drivers/mtd/nand/raw/s3c2410.c
index 48c1d0e..229f2e8 100644 (file)
--- a/drivers/mtd/nand/raw/s3c2410.c
+++ b/drivers/mtd/nand/raw/s3c2410.c
@@ -1213,7 +1213,7 @@ MODULE_DEVICE_TABLE(platform, s3c24xx_driver_ids);
 
 static struct platform_driver s3c24xx_nand_driver = {
        .probe          = s3c24xx_nand_probe,
-       .remove_new     = s3c24xx_nand_remove,
+       .remove         = s3c24xx_nand_remove,
        .suspend        = s3c24xx_nand_suspend,
        .resume         = s3c24xx_nand_resume,
        .id_table       = s3c24xx_driver_ids,

diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c
index 2a8164e..97f733e 100644 (file)
--- a/drivers/mtd/nand/raw/sh_flctl.c
+++ b/drivers/mtd/nand/raw/sh_flctl.c
@@ -1216,7 +1216,7 @@ static void flctl_remove(struct platform_device *pdev)
 
 static struct platform_driver flctl_driver = {
        .probe          = flctl_probe,
-       .remove_new     = flctl_remove,
+       .remove         = flctl_remove,
        .driver = {
                .name   = "sh_flctl",
                .of_match_table = of_flctl_match,

diff --git a/drivers/mtd/nand/raw/sharpsl.c b/drivers/mtd/nand/raw/sharpsl.c
index 2402dc5..142e93b 100644 (file)
--- a/drivers/mtd/nand/raw/sharpsl.c
+++ b/drivers/mtd/nand/raw/sharpsl.c
@@ -234,7 +234,7 @@ static struct platform_driver sharpsl_nand_driver = {
                .name   = "sharpsl-nand",
        },
        .probe          = sharpsl_nand_probe,
-       .remove_new     = sharpsl_nand_remove,
+       .remove         = sharpsl_nand_remove,
 };
 
 module_platform_driver(sharpsl_nand_driver);

diff --git a/drivers/mtd/nand/raw/socrates_nand.c b/drivers/mtd/nand/raw/socrates_nand.c
index 76d50eb..6685846 100644 (file)
--- a/drivers/mtd/nand/raw/socrates_nand.c
+++ b/drivers/mtd/nand/raw/socrates_nand.c
@@ -231,7 +231,7 @@ static struct platform_driver socrates_nand_driver = {
                .of_match_table = socrates_nand_match,
        },
        .probe          = socrates_nand_probe,
-       .remove_new     = socrates_nand_remove,
+       .remove         = socrates_nand_remove,
 };
 
 module_platform_driver(socrates_nand_driver);

diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 0f67e96..a960403 100644 (file)
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -2147,7 +2147,7 @@ MODULE_DEVICE_TABLE(of, stm32_fmc2_nfc_match);
 
 static struct platform_driver stm32_fmc2_nfc_driver = {
        .probe  = stm32_fmc2_nfc_probe,
-       .remove_new = stm32_fmc2_nfc_remove,
+       .remove = stm32_fmc2_nfc_remove,
        .driver = {
                .name = "stm32_fmc2_nfc",
                .of_match_table = stm32_fmc2_nfc_match,

diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index c28634e..fab371e 100644 (file)
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -2196,7 +2196,7 @@ static struct platform_driver sunxi_nfc_driver = {
                .of_match_table = sunxi_nfc_ids,
        },
        .probe = sunxi_nfc_probe,
-       .remove_new = sunxi_nfc_remove,
+       .remove = sunxi_nfc_remove,
 };
 module_platform_driver(sunxi_nfc_driver);
 

diff --git a/drivers/mtd/nand/raw/technologic-nand-controller.c b/drivers/mtd/nand/raw/technologic-nand-controller.c
index 0e45a6f..a3294aa 100644 (file)
--- a/drivers/mtd/nand/raw/technologic-nand-controller.c
+++ b/drivers/mtd/nand/raw/technologic-nand-controller.c
@@ -213,7 +213,7 @@ static struct platform_driver ts72xx_nand_driver = {
                .of_match_table = ts72xx_id_table,
        },
        .probe = ts72xx_nand_probe,
-       .remove_new = ts72xx_nand_remove,
+       .remove = ts72xx_nand_remove,
 };
 module_platform_driver(ts72xx_nand_driver);
 

diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c
index a553e3a..7f9eb5f 100644 (file)
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@@ -1279,7 +1279,7 @@ static struct platform_driver tegra_nand_driver = {
                .pm = &tegra_nand_pm,
        },
        .probe = tegra_nand_probe,
-       .remove_new = tegra_nand_remove,
+       .remove = tegra_nand_remove,
 };
 module_platform_driver(tegra_nand_driver);
 

diff --git a/drivers/mtd/nand/raw/txx9ndfmc.c b/drivers/mtd/nand/raw/txx9ndfmc.c
index 37f79c0..907fb5d 100644 (file)
--- a/drivers/mtd/nand/raw/txx9ndfmc.c
+++ b/drivers/mtd/nand/raw/txx9ndfmc.c
@@ -405,7 +405,7 @@ static int txx9ndfmc_resume(struct platform_device *dev)
 
 static struct platform_driver txx9ndfmc_driver = {
        .probe          = txx9ndfmc_probe,
-       .remove_new     = txx9ndfmc_remove,
+       .remove         = txx9ndfmc_remove,
        .resume         = txx9ndfmc_resume,
        .driver         = {
                .name   = "txx9ndfmc",

diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
index f31d232..4b5ba31 100644 (file)
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@@ -941,7 +941,7 @@ static struct platform_driver vf610_nfc_driver = {
                .pm     = &vf610_nfc_pm_ops,
        },
        .probe          = vf610_nfc_probe,
-       .remove_new     = vf610_nfc_remove,
+       .remove         = vf610_nfc_remove,
 };
 
 module_platform_driver(vf610_nfc_driver);

diff --git a/drivers/mtd/nand/raw/xway_nand.c b/drivers/mtd/nand/raw/xway_nand.c
index 0085490..af84395 100644 (file)
--- a/drivers/mtd/nand/raw/xway_nand.c
+++ b/drivers/mtd/nand/raw/xway_nand.c
@@ -256,7 +256,7 @@ static const struct of_device_id xway_nand_match[] = {
 
 static struct platform_driver xway_nand_driver = {
        .probe  = xway_nand_probe,
-       .remove_new = xway_nand_remove,
+       .remove = xway_nand_remove,
        .driver = {
                .name           = "lantiq,nand-xway",
                .of_match_table = xway_nand_match,

diff --git a/drivers/mtd/spi-nor/controllers/hisi-sfc.c b/drivers/mtd/spi-nor/controllers/hisi-sfc.c
index 89a7f0b..db948da 100644 (file)
--- a/drivers/mtd/spi-nor/controllers/hisi-sfc.c
+++ b/drivers/mtd/spi-nor/controllers/hisi-sfc.c
@@ -488,7 +488,7 @@ static struct platform_driver hisi_spi_nor_driver = {
                .of_match_table = hisi_spi_nor_dt_ids,
        },
        .probe  = hisi_spi_nor_probe,
-       .remove_new = hisi_spi_nor_remove,
+       .remove = hisi_spi_nor_remove,
 };
 module_platform_driver(hisi_spi_nor_driver);
 

diff --git a/drivers/mtd/spi-nor/controllers/nxp-spifi.c b/drivers/mtd/spi-nor/controllers/nxp-spifi.c
index 5aee62f..1a92d71 100644 (file)
--- a/drivers/mtd/spi-nor/controllers/nxp-spifi.c
+++ b/drivers/mtd/spi-nor/controllers/nxp-spifi.c
@@ -446,7 +446,7 @@ MODULE_DEVICE_TABLE(of, nxp_spifi_match);
 
 static struct platform_driver nxp_spifi_driver = {
        .probe  = nxp_spifi_probe,
-       .remove_new = nxp_spifi_remove,
+       .remove = nxp_spifi_remove,
        .driver = {
                .name = "nxp-spifi",
                .of_match_table = nxp_spifi_match,