spi: 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/spi 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.

The change for the spi-npcm-fiu stands out in the diffstat because the
inconsistent formatting style of the platform_driver initializer is
fixed to match the other struct initializer in the file.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/20240925113501.25208-2-u.kleine-koenig@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 4f288f07e38f918d06922f5f10961a0a74a479b2..20ee227dead29020f0f379953830ca0d121f06ac 100644 (file)
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -840,7 +840,7 @@ static struct platform_driver atmel_qspi_driver = {
                .pm     = pm_ptr(&atmel_qspi_pm_ops),
        },
        .probe          = atmel_qspi_probe,
-       .remove_new     = atmel_qspi_remove,
+       .remove         = atmel_qspi_remove,
 };
 module_platform_driver(atmel_qspi_driver);
 

diff --git a/drivers/spi/spi-ar934x.c b/drivers/spi/spi-ar934x.c
index 5ba988720851843653004a2e3a15df148ffa1976..86c54fff9d6e1c4428504bebd07df1540885275b 100644 (file)
--- a/drivers/spi/spi-ar934x.c
+++ b/drivers/spi/spi-ar934x.c
@@ -223,7 +223,7 @@ static struct platform_driver ar934x_spi_driver = {
                .of_match_table = ar934x_spi_match,
        },
        .probe = ar934x_spi_probe,
-       .remove_new = ar934x_spi_remove,
+       .remove = ar934x_spi_remove,
 };
 
 module_platform_driver(ar934x_spi_driver);

diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c
index bbd417c55e7f56c695cf72b70794d597901c17bd..8eb843ddb25f2e87df0a8acb0b22635891dfefe7 100644 (file)
--- a/drivers/spi/spi-aspeed-smc.c
+++ b/drivers/spi/spi-aspeed-smc.c
@@ -1189,7 +1189,7 @@ MODULE_DEVICE_TABLE(of, aspeed_spi_matches);
 
 static struct platform_driver aspeed_spi_driver = {
        .probe                  = aspeed_spi_probe,
-       .remove_new             = aspeed_spi_remove,
+       .remove                 = aspeed_spi_remove,
        .driver = {
                .name           = DEVICE_NAME,
                .of_match_table = aspeed_spi_matches,

diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c
index 1cea8e159344ec82a72be1b4410ee36bd3a95420..bbe97ce89a2fd35d5e59d2f7064bf6d9fc93ae2f 100644 (file)
--- a/drivers/spi/spi-at91-usart.c
+++ b/drivers/spi/spi-at91-usart.c
@@ -650,7 +650,7 @@ static struct platform_driver at91_usart_spi_driver = {
                .pm = &at91_usart_spi_pm_ops,
        },
        .probe = at91_usart_spi_probe,
-       .remove_new = at91_usart_spi_remove,
+       .remove = at91_usart_spi_remove,
 };
 
 module_platform_driver(at91_usart_spi_driver);

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index d78762d4db98f180aa0c8d9d8d0cce3dfc50f034..9a705a9fddd2ab006a3a7024939ac7665fd01ae8 100644 (file)
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -253,7 +253,7 @@ MODULE_DEVICE_TABLE(of, ath79_spi_of_match);
 
 static struct platform_driver ath79_spi_driver = {
        .probe          = ath79_spi_probe,
-       .remove_new     = ath79_spi_remove,
+       .remove         = ath79_spi_remove,
        .shutdown       = ath79_spi_shutdown,
        .driver         = {
                .name   = DRV_NAME,

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index b62f57390d8f0b424928fb07faf6d061e57179de..89a6b46cd3191a991d838155296f20b5d7a2cc64 100644 (file)
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1781,7 +1781,7 @@ static struct platform_driver atmel_spi_driver = {
                .of_match_table = atmel_spi_dt_ids,
        },
        .probe          = atmel_spi_probe,
-       .remove_new     = atmel_spi_remove,
+       .remove         = atmel_spi_remove,
 };
 module_platform_driver(atmel_spi_driver);
 

diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index 16f200bb3d17437b9884db0c94e70bd1c7daac81..b65798ccc6798a695fcecbbcd2489b8c1ab0cfec 100644 (file)
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -940,7 +940,7 @@ MODULE_ALIAS("platform:au1550-spi");
 
 static struct platform_driver au1550_spi_drv = {
        .probe = au1550_spi_probe,
-       .remove_new = au1550_spi_remove,
+       .remove = au1550_spi_remove,
        .driver = {
                .name = "au1550-spi",
        },

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index e1b9b12357877fea810336fa687eed6654ee4f05..0d1aa659248460efb5b0b3026c1ecdd06d18b3aa 100644 (file)
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -1435,7 +1435,7 @@ static struct platform_driver bcm2835_spi_driver = {
                .of_match_table = bcm2835_spi_match,
        },
        .probe          = bcm2835_spi_probe,
-       .remove_new     = bcm2835_spi_remove,
+       .remove         = bcm2835_spi_remove,
        .shutdown       = bcm2835_spi_remove,
 };
 module_platform_driver(bcm2835_spi_driver);

diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c
index 06fe155a70c98ede32be50dc35470d3ea416453f..90698d7d809dd1d9d4578e34d4f64b4ed3ab98d2 100644 (file)
--- a/drivers/spi/spi-bcm2835aux.c
+++ b/drivers/spi/spi-bcm2835aux.c
@@ -577,7 +577,7 @@ static struct platform_driver bcm2835aux_spi_driver = {
                .of_match_table = bcm2835aux_spi_match,
        },
        .probe          = bcm2835aux_spi_probe,
-       .remove_new     = bcm2835aux_spi_remove,
+       .remove         = bcm2835aux_spi_remove,
 };
 module_platform_driver(bcm2835aux_spi_driver);
 

diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
index 1ca857c2a4aa314d8e298e451ba609d3d8b78e5a..644b44d2aef24effb89b5c588ac30ed0369cca66 100644 (file)
--- a/drivers/spi/spi-bcm63xx-hsspi.c
+++ b/drivers/spi/spi-bcm63xx-hsspi.c
@@ -944,7 +944,7 @@ static struct platform_driver bcm63xx_hsspi_driver = {
                .of_match_table = bcm63xx_hsspi_of_match,
        },
        .probe          = bcm63xx_hsspi_probe,
-       .remove_new     = bcm63xx_hsspi_remove,
+       .remove         = bcm63xx_hsspi_remove,
 };
 
 module_platform_driver(bcm63xx_hsspi_driver);

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index ef3a7226db125c300f8eca72f692feac5d4bde6e..c8f64ec69344afb81cd3640bebc6f7469836552a 100644 (file)
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -656,7 +656,7 @@ static struct platform_driver bcm63xx_spi_driver = {
        },
        .id_table       = bcm63xx_spi_dev_match,
        .probe          = bcm63xx_spi_probe,
-       .remove_new     = bcm63xx_spi_remove,
+       .remove         = bcm63xx_spi_remove,
 };
 
 module_platform_driver(bcm63xx_spi_driver);

diff --git a/drivers/spi/spi-bcmbca-hsspi.c b/drivers/spi/spi-bcmbca-hsspi.c
index d936104a41ece764795c35ce79a15c9cce311707..f16298b75236095af538ef1651614b59f85d3432 100644 (file)
--- a/drivers/spi/spi-bcmbca-hsspi.c
+++ b/drivers/spi/spi-bcmbca-hsspi.c
@@ -633,7 +633,7 @@ static struct platform_driver bcmbca_hsspi_driver = {
                   .of_match_table = bcmbca_hsspi_of_match,
                   },
        .probe = bcmbca_hsspi_probe,
-       .remove_new = bcmbca_hsspi_remove,
+       .remove = bcmbca_hsspi_remove,
 };
 
 module_platform_driver(bcmbca_hsspi_driver);

diff --git a/drivers/spi/spi-brcmstb-qspi.c b/drivers/spi/spi-brcmstb-qspi.c
index e1b137419f5cdb745a81887fe062651fd300483b..7a33b479c1f7061f8dbb3277a013ade5609982c4 100644 (file)
--- a/drivers/spi/spi-brcmstb-qspi.c
+++ b/drivers/spi/spi-brcmstb-qspi.c
@@ -28,7 +28,7 @@ static void brcmstb_qspi_remove(struct platform_device *pdev)
 
 static struct platform_driver brcmstb_qspi_driver = {
        .probe                  = brcmstb_qspi_probe,
-       .remove_new             = brcmstb_qspi_remove,
+       .remove                 = brcmstb_qspi_remove,
        .driver = {
                .name           = "brcmstb_qspi",
                .pm             = &bcm_qspi_pm_ops,

diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 1755ca026f08ff817e8104f662129c4324c67990..0b45b7b2b3ab30951d94ea2ce57dcba3a2600847 100644 (file)
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -2112,7 +2112,7 @@ MODULE_DEVICE_TABLE(of, cqspi_dt_ids);
 
 static struct platform_driver cqspi_platform_driver = {
        .probe = cqspi_probe,
-       .remove_new = cqspi_remove,
+       .remove = cqspi_remove,
        .driver = {
                .name = CQSPI_NAME,
                .pm = pm_ptr(&cqspi_dev_pm_ops),

diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
index e07e081de5ea418e9fcc7d6aae5a3eeedda94d86..223939a7a6577cd2a4d2162204b016d2ffc12358 100644 (file)
--- a/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@ -804,7 +804,7 @@ MODULE_DEVICE_TABLE(of, cdns_spi_of_match);
 /* cdns_spi_driver - This structure defines the SPI subsystem platform driver */
 static struct platform_driver cdns_spi_driver = {
        .probe  = cdns_spi_probe,
-       .remove_new = cdns_spi_remove,
+       .remove = cdns_spi_remove,
        .driver = {
                .name = CDNS_SPI_NAME,
                .of_match_table = cdns_spi_of_match,

diff --git a/drivers/spi/spi-cavium-octeon.c b/drivers/spi/spi-cavium-octeon.c
index 4511c3b31223d39b072a7e7e48e9759dc75e40d4..a5ad90d66ec045d761aedeed32a7181407fb4bb8 100644 (file)
--- a/drivers/spi/spi-cavium-octeon.c
+++ b/drivers/spi/spi-cavium-octeon.c
@@ -90,7 +90,7 @@ static struct platform_driver octeon_spi_driver = {
                .of_match_table = octeon_spi_match,
        },
        .probe          = octeon_spi_probe,
-       .remove_new     = octeon_spi_remove,
+       .remove         = octeon_spi_remove,
 };
 
 module_platform_driver(octeon_spi_driver);

diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index e83cd0510f2029c0abc360ecb87d1e26010ce327..fdf37636cb9f08e907dfc513ba8f5bdd009008d5 100644 (file)
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -502,7 +502,7 @@ static struct platform_driver mcfqspi_driver = {
        .driver.name    = DRIVER_NAME,
        .driver.pm      = &mcfqspi_pm,
        .probe          = mcfqspi_probe,
-       .remove_new     = mcfqspi_remove,
+       .remove         = mcfqspi_remove,
 };
 module_platform_driver(mcfqspi_driver);
 

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index ad26c8409733ca8412bf9745234bbc6da226e4cc..a29934422356b6b6d4043c0f0b43b91e5ccd894b 100644 (file)
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -1039,7 +1039,7 @@ static struct platform_driver davinci_spi_driver = {
                .of_match_table = of_match_ptr(davinci_spi_of_match),
        },
        .probe = davinci_spi_probe,
-       .remove_new = davinci_spi_remove,
+       .remove = davinci_spi_remove,
 };
 module_platform_driver(davinci_spi_driver);
 

diff --git a/drivers/spi/spi-dln2.c b/drivers/spi/spi-dln2.c
index d319dc357fef078fb1f5f81ea22610cb910039d8..3e925d106dc9a3a06f9a13c227356a77f918ce0a 100644 (file)
--- a/drivers/spi/spi-dln2.c
+++ b/drivers/spi/spi-dln2.c
@@ -871,7 +871,7 @@ static struct platform_driver spi_dln2_driver = {
                .pm     = &dln2_spi_pm,
        },
        .probe          = dln2_spi_probe,
-       .remove_new     = dln2_spi_remove,
+       .remove         = dln2_spi_remove,
 };
 module_platform_driver(spi_dln2_driver);
 

diff --git a/drivers/spi/spi-dw-bt1.c b/drivers/spi/spi-dw-bt1.c
index 4577e8096cd952ebbc9d1989cf737f7871bb8637..abe6410f0e99233d2966dc41363dbd50984ad191 100644 (file)
--- a/drivers/spi/spi-dw-bt1.c
+++ b/drivers/spi/spi-dw-bt1.c
@@ -317,7 +317,7 @@ MODULE_DEVICE_TABLE(of, dw_spi_bt1_of_match);
 
 static struct platform_driver dw_spi_bt1_driver = {
        .probe  = dw_spi_bt1_probe,
-       .remove_new = dw_spi_bt1_remove,
+       .remove = dw_spi_bt1_remove,
        .driver = {
                .name           = "bt1-sys-ssi",
                .of_match_table = dw_spi_bt1_of_match,

diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index 819907e332c4b004f162067c0892a2db4a2171b7..863040cf5db76ef38cfdec777d651bea014256ae 100644 (file)
--- a/drivers/spi/spi-dw-mmio.c
+++ b/drivers/spi/spi-dw-mmio.c
@@ -433,7 +433,7 @@ MODULE_DEVICE_TABLE(acpi, dw_spi_mmio_acpi_match);
 
 static struct platform_driver dw_spi_mmio_driver = {
        .probe          = dw_spi_mmio_probe,
-       .remove_new     = dw_spi_mmio_remove,
+       .remove         = dw_spi_mmio_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .of_match_table = dw_spi_mmio_of_match,

diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index dc6bdc74643d3ac41bd39646244138e9e2c8f6cf..e1d097091925c2482f25f0667b7f45894b5e757d 100644 (file)
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -729,7 +729,7 @@ static struct platform_driver ep93xx_spi_driver = {
                .of_match_table = ep93xx_spi_of_ids,
        },
        .probe          = ep93xx_spi_probe,
-       .remove_new     = ep93xx_spi_remove,
+       .remove         = ep93xx_spi_remove,
 };
 module_platform_driver(ep93xx_spi_driver);
 

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 191de1917f8316784e07a3737f491dcba2388427..72044d76d736c8090e43eb2a2db470e60f90d625 100644 (file)
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -1469,7 +1469,7 @@ static struct platform_driver fsl_dspi_driver = {
        .driver.of_match_table  = fsl_dspi_dt_ids,
        .driver.pm              = &dspi_pm,
        .probe                  = dspi_probe,
-       .remove_new             = dspi_remove,
+       .remove                 = dspi_remove,
        .shutdown               = dspi_shutdown,
 };
 module_platform_driver(fsl_dspi_driver);

diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index ea647ee94da8ab1aaa87f03f893d41755a3f9dd3..6a73eaa34cf7cd514a3a13e4368927d5bc438c50 100644 (file)
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -835,7 +835,7 @@ static struct platform_driver fsl_espi_driver = {
                .pm = &espi_pm,
        },
        .probe          = of_fsl_espi_probe,
-       .remove_new     = of_fsl_espi_remove,
+       .remove         = of_fsl_espi_remove,
 };
 module_platform_driver(fsl_espi_driver);
 

diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c
index 9573b8fa4fbfc63c4af7b247bc951cf5ccc5b537..9edcaf2fdc5620b863cf9992de8ea3bcd9f301b0 100644 (file)
--- a/drivers/spi/spi-fsl-lpspi.c
+++ b/drivers/spi/spi-fsl-lpspi.c
@@ -1020,7 +1020,7 @@ static struct platform_driver fsl_lpspi_driver = {
                .pm = pm_ptr(&fsl_lpspi_pm_ops),
        },
        .probe = fsl_lpspi_probe,
-       .remove_new = fsl_lpspi_remove,
+       .remove = fsl_lpspi_remove,
 };
 module_platform_driver(fsl_lpspi_driver);
 

diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c
index 79bac30e79af64c12d8b890a75ef984fb2fa21d1..9ec53bf0dda8ead27bc7a11a9bb09a08efe2ea05 100644 (file)
--- a/drivers/spi/spi-fsl-qspi.c
+++ b/drivers/spi/spi-fsl-qspi.c
@@ -997,7 +997,7 @@ static struct platform_driver fsl_qspi_driver = {
                .pm =   &fsl_qspi_pm_ops,
        },
        .probe          = fsl_qspi_probe,
-       .remove_new     = fsl_qspi_remove,
+       .remove         = fsl_qspi_remove,
 };
 module_platform_driver(fsl_qspi_driver);
 

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 997e07c0a24aa9d59b5b733d17f2e6d38dc54e78..856a4a9def66f28a689ea7f8943aed73c753d1e4 100644 (file)
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -714,7 +714,7 @@ static struct platform_driver of_fsl_spi_driver = {
                .of_match_table = of_fsl_spi_match,
        },
        .probe          = of_fsl_spi_probe,
-       .remove_new     = of_fsl_spi_remove,
+       .remove         = of_fsl_spi_remove,
 };
 
 #ifdef CONFIG_MPC832x_RDB
@@ -757,7 +757,7 @@ static void plat_mpc8xxx_spi_remove(struct platform_device *pdev)
 MODULE_ALIAS("platform:mpc8xxx_spi");
 static struct platform_driver mpc8xxx_spi_driver = {
        .probe = plat_mpc8xxx_spi_probe,
-       .remove_new = plat_mpc8xxx_spi_remove,
+       .remove = plat_mpc8xxx_spi_remove,
        .driver = {
                .name = "mpc8xxx_spi",
        },

diff --git a/drivers/spi/spi-hisi-kunpeng.c b/drivers/spi/spi-hisi-kunpeng.c
index 16054695bdb04abf03a232f3ffb6ca12ff434eb7..dadf558dd9c0c66bcfa64174a6fcad42dd4b6006 100644 (file)
--- a/drivers/spi/spi-hisi-kunpeng.c
+++ b/drivers/spi/spi-hisi-kunpeng.c
@@ -542,7 +542,7 @@ MODULE_DEVICE_TABLE(acpi, hisi_spi_acpi_match);
 
 static struct platform_driver hisi_spi_driver = {
        .probe          = hisi_spi_probe,
-       .remove_new     = hisi_spi_remove,
+       .remove         = hisi_spi_remove,
        .driver         = {
                .name   = "hisi-kunpeng-spi",
                .acpi_match_table = hisi_spi_acpi_match,

diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c
index d8360f94d3b7df1b10de2dd3507e7ba9e5e08b65..168ccf51f6d4a8f8fe2635667bb734c65a8beb7c 100644 (file)
--- a/drivers/spi/spi-img-spfi.c
+++ b/drivers/spi/spi-img-spfi.c
@@ -756,7 +756,7 @@ static struct platform_driver img_spfi_driver = {
                .of_match_table = of_match_ptr(img_spfi_of_match),
        },
        .probe = img_spfi_probe,
-       .remove_new = img_spfi_remove,
+       .remove = img_spfi_remove,
 };
 module_platform_driver(img_spfi_driver);
 

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 85bd1a82a34eb4bc76a4b4528e087fc2ebfa8b85..bd83e4dc63bcab599bc206ed00f97f6d40be4c37 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1956,7 +1956,7 @@ static struct platform_driver spi_imx_driver = {
                   .pm = pm_ptr(&imx_spi_pm),
        },
        .probe = spi_imx_probe,
-       .remove_new = spi_imx_remove,
+       .remove = spi_imx_remove,
 };
 module_platform_driver(spi_imx_driver);
 

diff --git a/drivers/spi/spi-iproc-qspi.c b/drivers/spi/spi-iproc-qspi.c
index 39ee2b43a51627ca1b079f70800ad56b774a1f2a..392acc4026ab27d4055bdddbee48e936d3b108b3 100644 (file)
--- a/drivers/spi/spi-iproc-qspi.c
+++ b/drivers/spi/spi-iproc-qspi.c
@@ -138,7 +138,7 @@ MODULE_DEVICE_TABLE(of, bcm_iproc_of_match);
 
 static struct platform_driver bcm_iproc_driver = {
        .probe                  = bcm_iproc_probe,
-       .remove_new             = bcm_iproc_remove,
+       .remove                 = bcm_iproc_remove,
        .driver = {
                .name           = "bcm_iproc",
                .pm             = &bcm_qspi_pm_ops,

diff --git a/drivers/spi/spi-lantiq-ssc.c b/drivers/spi/spi-lantiq-ssc.c
index a1eb7f296f55a215bd483c883ac428f921fe18cf..60849e07f674a4b15e1051333b976de1336df5e5 100644 (file)
--- a/drivers/spi/spi-lantiq-ssc.c
+++ b/drivers/spi/spi-lantiq-ssc.c
@@ -1029,7 +1029,7 @@ static void lantiq_ssc_remove(struct platform_device *pdev)
 
 static struct platform_driver lantiq_ssc_driver = {
        .probe = lantiq_ssc_probe,
-       .remove_new = lantiq_ssc_remove,
+       .remove = lantiq_ssc_remove,
        .driver = {
                .name = "spi-lantiq-ssc",
                .of_match_table = lantiq_ssc_match,

diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c
index 1d05590a7434699a497eb77371c1a1c95684750d..df74ad5060f85a36178e5232404cac0734473012 100644 (file)
--- a/drivers/spi/spi-meson-spicc.c
+++ b/drivers/spi/spi-meson-spicc.c
@@ -949,7 +949,7 @@ MODULE_DEVICE_TABLE(of, meson_spicc_of_match);
 
 static struct platform_driver meson_spicc_driver = {
        .probe   = meson_spicc_probe,
-       .remove_new = meson_spicc_remove,
+       .remove = meson_spicc_remove,
        .driver  = {
                .name = "meson-spicc",
                .of_match_table = of_match_ptr(meson_spicc_of_match),

diff --git a/drivers/spi/spi-meson-spifc.c b/drivers/spi/spi-meson-spifc.c
index fd8b26dd4a792a7d42a0cb227996047710eb7881..ef7efeaeee97ee6e141d05ae07165c352d164988 100644 (file)
--- a/drivers/spi/spi-meson-spifc.c
+++ b/drivers/spi/spi-meson-spifc.c
@@ -429,7 +429,7 @@ MODULE_DEVICE_TABLE(of, meson_spifc_dt_match);
 
 static struct platform_driver meson_spifc_driver = {
        .probe  = meson_spifc_probe,
-       .remove_new = meson_spifc_remove,
+       .remove = meson_spifc_remove,
        .driver = {
                .name           = "meson-spifc",
                .of_match_table = of_match_ptr(meson_spifc_dt_match),

diff --git a/drivers/spi/spi-microchip-core-qspi.c b/drivers/spi/spi-microchip-core-qspi.c
index 09f16471c53757f8144e0429f041dd66df5e1be8..ad2b5ffa6153433490f09bdd4c362273a0218432 100644 (file)
--- a/drivers/spi/spi-microchip-core-qspi.c
+++ b/drivers/spi/spi-microchip-core-qspi.c
@@ -575,7 +575,7 @@ static struct platform_driver mchp_coreqspi_driver = {
                .name = "microchip,coreqspi",
                .of_match_table = mchp_coreqspi_of_match,
        },
-       .remove_new = mchp_coreqspi_remove,
+       .remove = mchp_coreqspi_remove,
 };
 module_platform_driver(mchp_coreqspi_driver);
 

diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c
index 7c1a9a9853733e231bda97d672b4fa0f082927c9..5b6af55855efc45c619e43a85ebe59cf0e11f078 100644 (file)
--- a/drivers/spi/spi-microchip-core.c
+++ b/drivers/spi/spi-microchip-core.c
@@ -622,7 +622,7 @@ static struct platform_driver mchp_corespi_driver = {
                .pm = MICROCHIP_SPI_PM_OPS,
                .of_match_table = of_match_ptr(mchp_corespi_dt_ids),
        },
-       .remove_new = mchp_corespi_remove,
+       .remove = mchp_corespi_remove,
 };
 module_platform_driver(mchp_corespi_driver);
 MODULE_DESCRIPTION("Microchip coreSPI SPI controller driver");

diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index d5ac60c135c20a4b438e9074f262b5b63d6c0e85..036bfb7bf18902744d974c6077fea858730537a4 100644 (file)
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -544,6 +544,6 @@ static struct platform_driver mpc52xx_spi_of_driver = {
                .of_match_table = mpc52xx_spi_match,
        },
        .probe = mpc52xx_spi_probe,
-       .remove_new = mpc52xx_spi_remove,
+       .remove = mpc52xx_spi_remove,
 };
 module_platform_driver(mpc52xx_spi_of_driver);

diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index dfee244fc3173cb868f253247a9eb8b5bfcf0c25..85f3bafc975dbc3fd95f77b8dcfc0ca9aac32f5d 100644 (file)
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -1432,7 +1432,7 @@ static struct platform_driver mtk_spi_driver = {
                .of_match_table = mtk_spi_of_match,
        },
        .probe = mtk_spi_probe,
-       .remove_new = mtk_spi_remove,
+       .remove = mtk_spi_remove,
 };
 
 module_platform_driver(mtk_spi_driver);

diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c
index 62b1c8995fa46b832d6cf02bc1009b52aabfcea4..85ab5ce96c4df84763bff54669fee90bbab78a6b 100644 (file)
--- a/drivers/spi/spi-mtk-nor.c
+++ b/drivers/spi/spi-mtk-nor.c
@@ -998,7 +998,7 @@ static struct platform_driver mtk_nor_driver = {
                .pm = &mtk_nor_pm_ops,
        },
        .probe = mtk_nor_probe,
-       .remove_new = mtk_nor_remove,
+       .remove = mtk_nor_remove,
 };
 
 module_platform_driver(mtk_nor_driver);

diff --git a/drivers/spi/spi-mtk-snfi.c b/drivers/spi/spi-mtk-snfi.c
index ddd98ddb79130a77c831b82d14355f65f0bd99c3..debe0e3c1c8b9468a987318540245e5c4115afd7 100644 (file)
--- a/drivers/spi/spi-mtk-snfi.c
+++ b/drivers/spi/spi-mtk-snfi.c
@@ -1477,7 +1477,7 @@ static void mtk_snand_remove(struct platform_device *pdev)
 
 static struct platform_driver mtk_snand_driver = {
        .probe = mtk_snand_probe,
-       .remove_new = mtk_snand_remove,
+       .remove = mtk_snand_remove,
        .driver = {
                .name = "mtk-snand",
                .of_match_table = mtk_snand_ids,

diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c
index 6156d691630a56b52ead0371f317559e86ec3f07..71edeb8dfc5fd54bbf2b09ff09224585663b6ff3 100644 (file)
--- a/drivers/spi/spi-mxic.c
+++ b/drivers/spi/spi-mxic.c
@@ -836,7 +836,7 @@ MODULE_DEVICE_TABLE(of, mxic_spi_of_ids);
 
 static struct platform_driver mxic_spi_driver = {
        .probe = mxic_spi_probe,
-       .remove_new = mxic_spi_remove,
+       .remove = mxic_spi_remove,
        .driver = {
                .name = "mxic-spi",
                .of_match_table = mxic_spi_of_ids,

diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 3e341d1ff3b63be96ba7a54be34ba69a2abdf36a..e6d955d964f4b5dd2f170b285b574f6d1e06d92f 100644 (file)
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -657,7 +657,7 @@ static void mxs_spi_remove(struct platform_device *pdev)
 
 static struct platform_driver mxs_spi_driver = {
        .probe  = mxs_spi_probe,
-       .remove_new = mxs_spi_remove,
+       .remove = mxs_spi_remove,
        .driver = {
                .name   = DRIVER_NAME,
                .of_match_table = mxs_spi_dt_ids,

diff --git a/drivers/spi/spi-npcm-fiu.c b/drivers/spi/spi-npcm-fiu.c
index f3bb8bbc192f297a31e18ac28b1ba1bc520ffa73..958bab27a08130dabb9cc959bd68c28438d953cc 100644 (file)
--- a/drivers/spi/spi-npcm-fiu.c
+++ b/drivers/spi/spi-npcm-fiu.c
@@ -766,12 +766,12 @@ MODULE_DEVICE_TABLE(of, npcm_fiu_dt_ids);
 
 static struct platform_driver npcm_fiu_driver = {
        .driver = {
-               .name   = "NPCM-FIU",
-               .bus    = &platform_bus_type,
+               .name = "NPCM-FIU",
+               .bus = &platform_bus_type,
                .of_match_table = npcm_fiu_dt_ids,
        },
-       .probe      = npcm_fiu_probe,
-       .remove_new         = npcm_fiu_remove,
+       .probe = npcm_fiu_probe,
+       .remove = npcm_fiu_remove,
 };
 module_platform_driver(npcm_fiu_driver);
 

diff --git a/drivers/spi/spi-npcm-pspi.c b/drivers/spi/spi-npcm-pspi.c
index a7feb20b06eee1112653e46d6c0d219b09515f17..e4c291e653c8e2a937818803981dc8fd8e996e48 100644 (file)
--- a/drivers/spi/spi-npcm-pspi.c
+++ b/drivers/spi/spi-npcm-pspi.c
@@ -452,7 +452,7 @@ static struct platform_driver npcm_pspi_driver = {
                .of_match_table = npcm_pspi_match,
        },
        .probe          = npcm_pspi_probe,
-       .remove_new     = npcm_pspi_remove,
+       .remove         = npcm_pspi_remove,
 };
 module_platform_driver(npcm_pspi_driver);
 

diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c
index 5a1e55a01c52109602aa1c379571fc0ece6ce2b7..1161b9e5a4dce633718e22022410b5e7435bb51c 100644 (file)
--- a/drivers/spi/spi-nxp-fspi.c
+++ b/drivers/spi/spi-nxp-fspi.c
@@ -1331,7 +1331,7 @@ static struct platform_driver nxp_fspi_driver = {
                .pm =   &nxp_fspi_pm_ops,
        },
        .probe          = nxp_fspi_probe,
-       .remove_new     = nxp_fspi_remove,
+       .remove         = nxp_fspi_remove,
 };
 module_platform_driver(nxp_fspi_driver);
 

diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index 7d8c5cd680d1d92784ea1dfd9ca4d1ef1ff50a51..cba2299203573113aa77fa8991217a3ca7755346 100644 (file)
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -288,7 +288,7 @@ MODULE_DEVICE_TABLE(of, tiny_spi_match);
 
 static struct platform_driver tiny_spi_driver = {
        .probe = tiny_spi_probe,
-       .remove_new = tiny_spi_remove,
+       .remove = tiny_spi_remove,
        .driver = {
                .name = DRV_NAME,
                .pm = NULL,

diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index 03b820e856511a96d6f718090e9d7e5247cf50de..b9a91dbfeaef8274b6f1fc64fe6c3d8c0da3df24 100644 (file)
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -523,7 +523,7 @@ static struct platform_driver uwire_driver = {
                .name           = "omap_uwire",
        },
        .probe = uwire_probe,
-       .remove_new = uwire_remove,
+       .remove = uwire_remove,
        // suspend ... unuse ck
        // resume ... use ck
 };

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 2c043817c66a88ff556710362a9e596ba54a143d..e2400a067a95682b07825705736adc39a3f86baf 100644 (file)
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1654,7 +1654,7 @@ static struct platform_driver omap2_mcspi_driver = {
                .of_match_table = omap_mcspi_of_match,
        },
        .probe =        omap2_mcspi_probe,
-       .remove_new =   omap2_mcspi_remove,
+       .remove =       omap2_mcspi_remove,
 };
 
 module_platform_driver(omap2_mcspi_driver);

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index eee9ff4bfa5b57f10effb3966266a6d2bdcda236..6ff42475f851c704a94a7ed1788a96be53ff2839 100644 (file)
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -846,7 +846,7 @@ static struct platform_driver orion_spi_driver = {
                .of_match_table = of_match_ptr(orion_spi_of_match_table),
        },
        .probe          = orion_spi_probe,
-       .remove_new     = orion_spi_remove,
+       .remove         = orion_spi_remove,
 };
 
 module_platform_driver(orion_spi_driver);

diff --git a/drivers/spi/spi-pic32-sqi.c b/drivers/spi/spi-pic32-sqi.c
index 762b1c5c6f757815e71fc299c16d612bad115c12..fa0c1ee84532cd227172f2df2f45886ae643a3ea 100644 (file)
--- a/drivers/spi/spi-pic32-sqi.c
+++ b/drivers/spi/spi-pic32-sqi.c
@@ -682,7 +682,7 @@ static struct platform_driver pic32_sqi_driver = {
                .of_match_table = of_match_ptr(pic32_sqi_of_ids),
        },
        .probe = pic32_sqi_probe,
-       .remove_new = pic32_sqi_remove,
+       .remove = pic32_sqi_remove,
 };
 
 module_platform_driver(pic32_sqi_driver);

diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c
index b8bcc220e96d61cbe4423bf0a6b141e3a1acb230..369850d1431367de47552ff00e44dae45974c3e8 100644 (file)
--- a/drivers/spi/spi-pic32.c
+++ b/drivers/spi/spi-pic32.c
@@ -859,7 +859,7 @@ static struct platform_driver pic32_spi_driver = {
                .of_match_table = of_match_ptr(pic32_spi_of_match),
        },
        .probe = pic32_spi_probe,
-       .remove_new = pic32_spi_remove,
+       .remove = pic32_spi_remove,
 };
 
 module_platform_driver(pic32_spi_driver);

diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index 4a64ea0f596f9a41c1f33844372e714c0d1089ac..688cabcfbc5266398967324f5676bc9a8dc25b2a 100644 (file)
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -484,7 +484,7 @@ MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match);
 
 static struct platform_driver spi_ppc4xx_of_driver = {
        .probe = spi_ppc4xx_of_probe,
-       .remove_new = spi_ppc4xx_of_remove,
+       .remove = spi_ppc4xx_of_remove,
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = spi_ppc4xx_of_match,

diff --git a/drivers/spi/spi-pxa2xx-platform.c b/drivers/spi/spi-pxa2xx-platform.c
index 595af9fa4e0f89837672f92785e55ddba8cca45f..b88b7de7a005008b6d6059a7ca7eaa1053a47890 100644 (file)
--- a/drivers/spi/spi-pxa2xx-platform.c
+++ b/drivers/spi/spi-pxa2xx-platform.c
@@ -207,7 +207,7 @@ static struct platform_driver driver = {
                .of_match_table = pxa2xx_spi_of_match,
        },
        .probe = pxa2xx_spi_platform_probe,
-       .remove_new = pxa2xx_spi_platform_remove,
+       .remove = pxa2xx_spi_platform_remove,
 };
 
 static int __init pxa2xx_spi_init(void)

diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c
index 49b77513448519d415be7b7e5ba77e011065db4c..056f02677376fc064c8566f906f532a0cef78c73 100644 (file)
--- a/drivers/spi/spi-qcom-qspi.c
+++ b/drivers/spi/spi-qcom-qspi.c
@@ -908,7 +908,7 @@ static struct platform_driver qcom_qspi_driver = {
                .of_match_table = qcom_qspi_dt_match,
        },
        .probe = qcom_qspi_probe,
-       .remove_new = qcom_qspi_remove,
+       .remove = qcom_qspi_remove,
 };
 module_platform_driver(qcom_qspi_driver);
 

diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 1a2f9cd92b3c2dbdc7c21b87fea63346b67172c6..7d647edf6bc31c2963798f952e445707df803beb 100644 (file)
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -1364,7 +1364,7 @@ static struct platform_driver spi_qup_driver = {
                .of_match_table = spi_qup_dt_match,
        },
        .probe = spi_qup_probe,
-       .remove_new = spi_qup_remove,
+       .remove = spi_qup_remove,
 };
 module_platform_driver(spi_qup_driver);
 

diff --git a/drivers/spi/spi-rb4xx.c b/drivers/spi/spi-rb4xx.c
index 225f75550780282fc59a2ab8197a25fa10a2be80..e71d3805b150de35e7c68f8245cf73fed682a312 100644 (file)
--- a/drivers/spi/spi-rb4xx.c
+++ b/drivers/spi/spi-rb4xx.c
@@ -196,7 +196,7 @@ MODULE_DEVICE_TABLE(of, rb4xx_spi_dt_match);
 
 static struct platform_driver rb4xx_spi_drv = {
        .probe = rb4xx_spi_probe,
-       .remove_new = rb4xx_spi_remove,
+       .remove = rb4xx_spi_remove,
        .driver = {
                .name = "rb4xx-spi",
                .of_match_table = of_match_ptr(rb4xx_spi_dt_match),

diff --git a/drivers/spi/spi-rockchip-sfc.c b/drivers/spi/spi-rockchip-sfc.c
index 04b9377a28028695e12d59f6a92c7ad92eaf683a..5c0554e9d24d65602964f1a0105f1468f6159e9c 100644 (file)
--- a/drivers/spi/spi-rockchip-sfc.c
+++ b/drivers/spi/spi-rockchip-sfc.c
@@ -677,7 +677,7 @@ static struct platform_driver rockchip_sfc_driver = {
                .of_match_table = rockchip_sfc_dt_ids,
        },
        .probe  = rockchip_sfc_probe,
-       .remove_new = rockchip_sfc_remove,
+       .remove = rockchip_sfc_remove,
 };
 module_platform_driver(rockchip_sfc_driver);
 

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index f1e0c16e813682d36f725089d88e0a810abe3f35..22b97dffc7fd568ec4dbc41a005ab41edac97bdf 100644 (file)
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -1036,7 +1036,7 @@ static struct platform_driver rockchip_spi_driver = {
                .of_match_table = of_match_ptr(rockchip_spi_dt_match),
        },
        .probe = rockchip_spi_probe,
-       .remove_new = rockchip_spi_remove,
+       .remove = rockchip_spi_remove,
 };
 
 module_platform_driver(rockchip_spi_driver);

diff --git a/drivers/spi/spi-rpc-if.c b/drivers/spi/spi-rpc-if.c
index b468a95972bf7290eab7e656aaf68ece5bf643a6..118ec54cc64f4d6b97ae83dfde6c2905da81a991 100644 (file)
--- a/drivers/spi/spi-rpc-if.c
+++ b/drivers/spi/spi-rpc-if.c
@@ -206,7 +206,7 @@ MODULE_DEVICE_TABLE(platform, rpc_if_spi_id_table);
 
 static struct platform_driver rpcif_spi_driver = {
        .probe  = rpcif_spi_probe,
-       .remove_new = rpcif_spi_remove,
+       .remove = rpcif_spi_remove,
        .id_table = rpc_if_spi_id_table,
        .driver = {
                .name   = "rpc-if-spi",

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 7f95d22fb1ac65e194d2760d82c77ed8695ab7eb..92faaf614f8ea1b33b689e05dc8f049e3f446bd0 100644 (file)
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -1427,7 +1427,7 @@ static SIMPLE_DEV_PM_OPS(rspi_pm_ops, rspi_suspend, rspi_resume);
 
 static struct platform_driver rspi_driver = {
        .probe =        rspi_probe,
-       .remove_new =   rspi_remove,
+       .remove =       rspi_remove,
        .id_table =     spi_driver_ids,
        .driver         = {
                .name = "renesas_spi",

diff --git a/drivers/spi/spi-rzv2m-csi.c b/drivers/spi/spi-rzv2m-csi.c
index 741e0f44c49cc3fe0105b170b7cdc27514834088..7c0442883ac08e2ae363d588c3d1ff14e8453693 100644 (file)
--- a/drivers/spi/spi-rzv2m-csi.c
+++ b/drivers/spi/spi-rzv2m-csi.c
@@ -683,7 +683,7 @@ MODULE_DEVICE_TABLE(of, rzv2m_csi_match);
 
 static struct platform_driver rzv2m_csi_drv = {
        .probe = rzv2m_csi_probe,
-       .remove_new = rzv2m_csi_remove,
+       .remove = rzv2m_csi_remove,
        .driver = {
                .name = "rzv2m_csi",
                .of_match_table = rzv2m_csi_match,

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 2771fe1397e42f6405f4ff44246f1d6446b567b5..5c07a832693395c3a75ba16cfb717bdc7e7b4bee 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1681,7 +1681,7 @@ static struct platform_driver s3c64xx_spi_driver = {
                .of_match_table = of_match_ptr(s3c64xx_spi_dt_match),
        },
        .probe = s3c64xx_spi_probe,
-       .remove_new = s3c64xx_spi_remove,
+       .remove = s3c64xx_spi_remove,
        .id_table = s3c64xx_spi_driver_ids,
 };
 MODULE_ALIAS("platform:s3c64xx-spi");

diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index 5d63aa1d28e2bc87ff70287ecb1f3b4796ecc069..93017faeb7b554979f82ff1e2391d9319d8f7ac0 100644 (file)
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -293,7 +293,7 @@ MODULE_DEVICE_TABLE(of, hspi_of_match);
 
 static struct platform_driver hspi_driver = {
        .probe = hspi_probe,
-       .remove_new = hspi_remove,
+       .remove = hspi_remove,
        .driver = {
                .name = "sh-hspi",
                .of_match_table = hspi_of_match,

diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 6f12e4fb2e2e184f1bb4cf9fe12e5437384fc4ac..4ed6613b81882b2352bf85c2b94766eaeae99cea 100644 (file)
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -1429,7 +1429,7 @@ static SIMPLE_DEV_PM_OPS(sh_msiof_spi_pm_ops, sh_msiof_spi_suspend,
 
 static struct platform_driver sh_msiof_spi_drv = {
        .probe          = sh_msiof_spi_probe,
-       .remove_new     = sh_msiof_spi_remove,
+       .remove         = sh_msiof_spi_remove,
        .id_table       = spi_driver_ids,
        .driver         = {
                .name           = "spi_sh_msiof",

diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c
index 3d560b154ad36b3ea672c8494fba8fd9df0d1311..f66efaabcacadb5dd07b166ade642932c8c72fda 100644 (file)
--- a/drivers/spi/spi-sh-sci.c
+++ b/drivers/spi/spi-sh-sci.c
@@ -183,7 +183,7 @@ static void sh_sci_spi_remove(struct platform_device *dev)
 
 static struct platform_driver sh_sci_spi_drv = {
        .probe          = sh_sci_spi_probe,
-       .remove_new     = sh_sci_spi_remove,
+       .remove         = sh_sci_spi_remove,
        .driver         = {
                .name   = "spi_sh_sci",
        },

diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c
index 4b873d9a7602a81e36f6a3da569edc703bd9e024..130d7fc452fa8301b431bc549ca0d77f8da35657 100644 (file)
--- a/drivers/spi/spi-sh.c
+++ b/drivers/spi/spi-sh.c
@@ -459,7 +459,7 @@ static int spi_sh_probe(struct platform_device *pdev)
 
 static struct platform_driver spi_sh_driver = {
        .probe = spi_sh_probe,
-       .remove_new = spi_sh_remove,
+       .remove = spi_sh_remove,
        .driver = {
                .name = "sh_spi",
        },

diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
index cfd17bbb2202307c517d3c25b13421e86d6050be..87bde2a207a3e86f0d5dbe528a1e95312b5cbffd 100644 (file)
--- a/drivers/spi/spi-sifive.c
+++ b/drivers/spi/spi-sifive.c
@@ -471,7 +471,7 @@ MODULE_DEVICE_TABLE(of, sifive_spi_of_match);
 
 static struct platform_driver sifive_spi_driver = {
        .probe = sifive_spi_probe,
-       .remove_new = sifive_spi_remove,
+       .remove = sifive_spi_remove,
        .driver = {
                .name = SIFIVE_SPI_DRIVER_NAME,
                .pm = &sifive_spi_pm_ops,

diff --git a/drivers/spi/spi-slave-mt27xx.c b/drivers/spi/spi-slave-mt27xx.c
index 40e1e7de0742fce3e3100a78682935419909f970..9846f025dd4c40fa2bdf78c82126da986bac956c 100644 (file)
--- a/drivers/spi/spi-slave-mt27xx.c
+++ b/drivers/spi/spi-slave-mt27xx.c
@@ -556,7 +556,7 @@ static struct platform_driver mtk_spi_slave_driver = {
                .of_match_table = mtk_spi_slave_of_match,
        },
        .probe = mtk_spi_slave_probe,
-       .remove_new = mtk_spi_slave_remove,
+       .remove = mtk_spi_slave_remove,
 };
 
 module_platform_driver(mtk_spi_slave_driver);

diff --git a/drivers/spi/spi-sn-f-ospi.c b/drivers/spi/spi-sn-f-ospi.c
index a7c3b3923b4af7918ca84deedc6189fe20079c92..adac645732fedfe6e33a5a0979ba43d5d203bfce 100644 (file)
--- a/drivers/spi/spi-sn-f-ospi.c
+++ b/drivers/spi/spi-sn-f-ospi.c
@@ -680,7 +680,7 @@ static struct platform_driver f_ospi_driver = {
                .of_match_table = f_ospi_dt_ids,
        },
        .probe = f_ospi_probe,
-       .remove_new = f_ospi_remove,
+       .remove = f_ospi_remove,
 };
 module_platform_driver(f_ospi_driver);
 

diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c
index 233ebfb8df5ef9059c204ea2c997e567364c3c13..ae794058b381581ce92cfecc4f60bdd0adb65b77 100644 (file)
--- a/drivers/spi/spi-sprd.c
+++ b/drivers/spi/spi-sprd.c
@@ -1072,7 +1072,7 @@ static struct platform_driver sprd_spi_driver = {
                .pm = &sprd_spi_pm_ops,
        },
        .probe = sprd_spi_probe,
-       .remove_new = sprd_spi_remove,
+       .remove = sprd_spi_remove,
 };
 
 module_platform_driver(sprd_spi_driver);

diff --git a/drivers/spi/spi-st-ssc4.c b/drivers/spi/spi-st-ssc4.c
index e064025e2fd6d0deb49c6f389e404f0a7fc507fc..4cff976ab16fbdf3708ab870176a04f2628b501b 100644 (file)
--- a/drivers/spi/spi-st-ssc4.c
+++ b/drivers/spi/spi-st-ssc4.c
@@ -449,7 +449,7 @@ static struct platform_driver spi_st_driver = {
                .of_match_table = of_match_ptr(stm_spi_match),
        },
        .probe = spi_st_probe,
-       .remove_new = spi_st_remove,
+       .remove = spi_st_remove,
 };
 module_platform_driver(spi_st_driver);
 

diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c
index 955c920c4b639055cd8ecfc9a436965f6b6df265..540b6948b24db0553fbac738212c7625331654f6 100644 (file)
--- a/drivers/spi/spi-stm32-qspi.c
+++ b/drivers/spi/spi-stm32-qspi.c
@@ -963,7 +963,7 @@ MODULE_DEVICE_TABLE(of, stm32_qspi_match);
 
 static struct platform_driver stm32_qspi_driver = {
        .probe  = stm32_qspi_probe,
-       .remove_new = stm32_qspi_remove,
+       .remove = stm32_qspi_remove,
        .driver = {
                .name = "stm32-qspi",
                .of_match_table = stm32_qspi_match,

diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c
index 4c4ff074e3f6f84caa2c9aa617f9808405093b04..f2dd8ab12df831d54758d21ec1a68ffc40e2f0a6 100644 (file)
--- a/drivers/spi/spi-stm32.c
+++ b/drivers/spi/spi-stm32.c
@@ -2355,7 +2355,7 @@ static const struct dev_pm_ops stm32_spi_pm_ops = {
 
 static struct platform_driver stm32_spi_driver = {
        .probe = stm32_spi_probe,
-       .remove_new = stm32_spi_remove,
+       .remove = stm32_spi_remove,
        .driver = {
                .name = DRIVER_NAME,
                .pm = &stm32_spi_pm_ops,

diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c
index 2ee6755b43f549247a6953cc2ae3b09ea81acd5c..fcbe864c9b7d69e11c29f7b8f5fb78e4f9ae2cc7 100644 (file)
--- a/drivers/spi/spi-sun4i.c
+++ b/drivers/spi/spi-sun4i.c
@@ -535,7 +535,7 @@ static const struct dev_pm_ops sun4i_spi_pm_ops = {
 
 static struct platform_driver sun4i_spi_driver = {
        .probe  = sun4i_spi_probe,
-       .remove_new = sun4i_spi_remove,
+       .remove = sun4i_spi_remove,
        .driver = {
                .name           = "sun4i-spi",
                .of_match_table = sun4i_spi_match,

diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c
index 5c26bf056293f661a9acb7935964361d01ce94ee..871dfd3e77be281d2e25074d5ea535535c942539 100644 (file)
--- a/drivers/spi/spi-sun6i.c
+++ b/drivers/spi/spi-sun6i.c
@@ -810,7 +810,7 @@ static const struct dev_pm_ops sun6i_spi_pm_ops = {
 
 static struct platform_driver sun6i_spi_driver = {
        .probe  = sun6i_spi_probe,
-       .remove_new = sun6i_spi_remove,
+       .remove = sun6i_spi_remove,
        .driver = {
                .name           = "sun6i-spi",
                .of_match_table = sun6i_spi_match,

diff --git a/drivers/spi/spi-sunplus-sp7021.c b/drivers/spi/spi-sunplus-sp7021.c
index 4e481380c259dd31994ed1bebaedf1a7337eab63..7fd4cc6f74c25ef5d514b7e10b076da4e44baa26 100644 (file)
--- a/drivers/spi/spi-sunplus-sp7021.c
+++ b/drivers/spi/spi-sunplus-sp7021.c
@@ -563,7 +563,7 @@ MODULE_DEVICE_TABLE(of, sp7021_spi_controller_ids);
 
 static struct platform_driver sp7021_spi_controller_driver = {
        .probe = sp7021_spi_controller_probe,
-       .remove_new = sp7021_spi_controller_remove,
+       .remove = sp7021_spi_controller_remove,
        .driver = {
                .name = "sunplus,sp7021-spi-controller",
                .of_match_table = sp7021_spi_controller_ids,

diff --git a/drivers/spi/spi-synquacer.c b/drivers/spi/spi-synquacer.c
index 7cb4301a6fb285239bbee686e1f2310fe09d7a22..eaf560487591d9befaab64266b808b6549650816 100644 (file)
--- a/drivers/spi/spi-synquacer.c
+++ b/drivers/spi/spi-synquacer.c
@@ -818,7 +818,7 @@ static struct platform_driver synquacer_spi_driver = {
                .acpi_match_table = ACPI_PTR(synquacer_hsspi_acpi_ids),
        },
        .probe = synquacer_spi_probe,
-       .remove_new = synquacer_spi_remove,
+       .remove = synquacer_spi_remove,
 };
 module_platform_driver(synquacer_spi_driver);
 

diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index bc7cc4088eea0d0d8978c69dd3b797107d3ff6eb..3822d7c8d8edb9730e937df50d1c75e095dd18ec 100644 (file)
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -1518,7 +1518,7 @@ static struct platform_driver tegra_spi_driver = {
                .of_match_table = tegra_spi_of_match,
        },
        .probe =        tegra_spi_probe,
-       .remove_new =   tegra_spi_remove,
+       .remove =       tegra_spi_remove,
 };
 module_platform_driver(tegra_spi_driver);
 

diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 9f6b9f89be5b8423ae0aa7be5289b8844ae38e3a..d5c8ee20b8e5b230779d0e858fea800eeb7d1d3a 100644 (file)
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -600,7 +600,7 @@ static struct platform_driver tegra_sflash_driver = {
                .of_match_table = tegra_sflash_of_match,
        },
        .probe =        tegra_sflash_probe,
-       .remove_new =   tegra_sflash_remove,
+       .remove =       tegra_sflash_remove,
 };
 module_platform_driver(tegra_sflash_driver);
 

diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 04838b036e24e9fa5c1cd71d3e5a728a2a52e868..fe452d03c1ee4335951947550e2f3447505a89b0 100644 (file)
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -1214,7 +1214,7 @@ static struct platform_driver tegra_slink_driver = {
                .of_match_table = tegra_slink_of_match,
        },
        .probe =        tegra_slink_probe,
-       .remove_new =   tegra_slink_remove,
+       .remove =       tegra_slink_remove,
 };
 module_platform_driver(tegra_slink_driver);
 

diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c
index afbd64a217eb06abd029191902432337108e559c..40f2afad1899f736a7d9a56dec2916bb40edc46d 100644 (file)
--- a/drivers/spi/spi-tegra210-quad.c
+++ b/drivers/spi/spi-tegra210-quad.c
@@ -1724,7 +1724,7 @@ static struct platform_driver tegra_qspi_driver = {
                .acpi_match_table = ACPI_PTR(tegra_qspi_acpi_match),
        },
        .probe =        tegra_qspi_probe,
-       .remove_new =   tegra_qspi_remove,
+       .remove =       tegra_qspi_remove,
 };
 module_platform_driver(tegra_qspi_driver);
 

diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index 0fe6899e78dda54620e6ccd8e8cae6759987c400..0b8f496c6bf404d0b2db129cbfc4e916c477d295 100644 (file)
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -931,7 +931,7 @@ static const struct dev_pm_ops ti_qspi_pm_ops = {
 
 static struct platform_driver ti_qspi_driver = {
        .probe  = ti_qspi_probe,
-       .remove_new = ti_qspi_remove,
+       .remove = ti_qspi_remove,
        .driver = {
                .name   = "ti-qspi",
                .pm =   &ti_qspi_pm_ops,

diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 271f3e7f834be42ef19323efe98682534948f45f..60fce5c73031f7fb8a67973b12e2e69ad57e4cbb 100644 (file)
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1514,7 +1514,7 @@ static struct platform_driver pch_spi_pd_driver = {
                .name = "pch-spi",
        },
        .probe = pch_spi_pd_probe,
-       .remove_new = pch_spi_pd_remove,
+       .remove = pch_spi_pd_remove,
        .suspend = pch_spi_pd_suspend,
        .resume = pch_spi_pd_resume
 };

diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c
index 4a18cf89619473f825160d5bf45be728e6478a66..15f76855bea4772922794d77e4b332c2ede4173c 100644 (file)
--- a/drivers/spi/spi-uniphier.c
+++ b/drivers/spi/spi-uniphier.c
@@ -796,7 +796,7 @@ MODULE_DEVICE_TABLE(of, uniphier_spi_match);
 
 static struct platform_driver uniphier_spi_driver = {
        .probe = uniphier_spi_probe,
-       .remove_new = uniphier_spi_remove,
+       .remove = uniphier_spi_remove,
        .driver = {
                .name = "uniphier-spi",
                .of_match_table = uniphier_spi_match,

diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index 7795328427a68b9858dc9f97c376ef18a0335c6a..ded709b2b45918b10424f87873f7c72844780f6e 100644 (file)
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -524,7 +524,7 @@ MODULE_ALIAS("platform:" XILINX_SPI_NAME);
 
 static struct platform_driver xilinx_spi_driver = {
        .probe = xilinx_spi_probe,
-       .remove_new = xilinx_spi_remove,
+       .remove = xilinx_spi_remove,
        .driver = {
                .name = XILINX_SPI_NAME,
                .of_match_table = xilinx_spi_of_match,

diff --git a/drivers/spi/spi-xtensa-xtfpga.c b/drivers/spi/spi-xtensa-xtfpga.c
index 3c2cda3153973f945e92afdde4a1bf790a9055f8..1b54d8f9f5ec51b9763f754e7317de58e1180817 100644 (file)
--- a/drivers/spi/spi-xtensa-xtfpga.c
+++ b/drivers/spi/spi-xtensa-xtfpga.c
@@ -138,7 +138,7 @@ MODULE_DEVICE_TABLE(of, xtfpga_spi_of_match);
 
 static struct platform_driver xtfpga_spi_driver = {
        .probe = xtfpga_spi_probe,
-       .remove_new = xtfpga_spi_remove,
+       .remove = xtfpga_spi_remove,
        .driver = {
                .name = XTFPGA_SPI_NAME,
                .of_match_table = of_match_ptr(xtfpga_spi_of_match),

diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c
index b67455bda972b22c6043e42f39a065a18653aa5a..dee9c339a35e74c86fe1c768990a3f870b0a1b9d 100644 (file)
--- a/drivers/spi/spi-zynq-qspi.c
+++ b/drivers/spi/spi-zynq-qspi.c
@@ -763,7 +763,7 @@ MODULE_DEVICE_TABLE(of, zynq_qspi_of_match);
  */
 static struct platform_driver zynq_qspi_driver = {
        .probe = zynq_qspi_probe,
-       .remove_new = zynq_qspi_remove,
+       .remove = zynq_qspi_remove,
        .driver = {
                .name = "zynq-qspi",
                .of_match_table = zynq_qspi_of_match,

diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c
index fcd0ca996684195604ad0ee61d3e8874ad74b8bc..84cce78e4f2e9958c4d26e1e89a076f8b94bd9ba 100644 (file)
--- a/drivers/spi/spi-zynqmp-gqspi.c
+++ b/drivers/spi/spi-zynqmp-gqspi.c
@@ -1389,7 +1389,7 @@ MODULE_DEVICE_TABLE(of, zynqmp_qspi_of_match);
 
 static struct platform_driver zynqmp_qspi_driver = {
        .probe = zynqmp_qspi_probe,
-       .remove_new = zynqmp_qspi_remove,
+       .remove = zynqmp_qspi_remove,
        .driver = {
                .name = "zynqmp-qspi",
                .of_match_table = zynqmp_qspi_of_match,