i2c: 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/i2c 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: Andi Shyti <andi.shyti@kernel.org>

diff --git a/drivers/i2c/busses/i2c-altera.c b/drivers/i2c/busses/i2c-altera.c
index f4dde08a3b92cbc322b15726da5ef3666ac3bcfb..2da73173ce248fe7151913ffd5a564c15d7ec8b3 100644 (file)
--- a/drivers/i2c/busses/i2c-altera.c
+++ b/drivers/i2c/busses/i2c-altera.c
@@ -482,7 +482,7 @@ MODULE_DEVICE_TABLE(of, altr_i2c_of_match);
 
 static struct platform_driver altr_i2c_driver = {
        .probe = altr_i2c_probe,
-       .remove_new = altr_i2c_remove,
+       .remove = altr_i2c_remove,
        .driver = {
                .name = "altera-i2c",
                .of_match_table = altr_i2c_of_match,

diff --git a/drivers/i2c/busses/i2c-amd-mp2-plat.c b/drivers/i2c/busses/i2c-amd-mp2-plat.c
index 6f0ef587e76d1458b51276d86ec1af1815e0385b..d9dd0e475d1a3811fbc87c341049d1f68d2cbe55 100644 (file)
--- a/drivers/i2c/busses/i2c-amd-mp2-plat.c
+++ b/drivers/i2c/busses/i2c-amd-mp2-plat.c
@@ -346,7 +346,7 @@ MODULE_DEVICE_TABLE(acpi, i2c_amd_acpi_match);
 
 static struct platform_driver i2c_amd_plat_driver = {
        .probe = i2c_amd_probe,
-       .remove_new = i2c_amd_remove,
+       .remove = i2c_amd_remove,
        .driver = {
                .name = "i2c_amd_mp2",
                .acpi_match_table = ACPI_PTR(i2c_amd_acpi_match),

diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
index cc5a26637fd540d3781d11ab133a7e5908525855..1550d3d552aed450c0b320d3fe7368af83df11e3 100644 (file)
--- a/drivers/i2c/busses/i2c-aspeed.c
+++ b/drivers/i2c/busses/i2c-aspeed.c
@@ -1102,7 +1102,7 @@ static void aspeed_i2c_remove_bus(struct platform_device *pdev)
 
 static struct platform_driver aspeed_i2c_bus_driver = {
        .probe          = aspeed_i2c_probe_bus,
-       .remove_new     = aspeed_i2c_remove_bus,
+       .remove         = aspeed_i2c_remove_bus,
        .driver         = {
                .name           = "aspeed-i2c-bus",
                .of_match_table = aspeed_i2c_bus_of_table,

diff --git a/drivers/i2c/busses/i2c-at91-core.c b/drivers/i2c/busses/i2c-at91-core.c
index dc52b35307256d663ac8167630492bbc97e8b4f2..edc047e3e535c8ca9ce67c000a755a2e8827cc3c 100644 (file)
--- a/drivers/i2c/busses/i2c-at91-core.c
+++ b/drivers/i2c/busses/i2c-at91-core.c
@@ -330,7 +330,7 @@ static const struct dev_pm_ops __maybe_unused at91_twi_pm = {
 
 static struct platform_driver at91_twi_driver = {
        .probe          = at91_twi_probe,
-       .remove_new     = at91_twi_remove,
+       .remove         = at91_twi_remove,
        .id_table       = at91_twi_devtypes,
        .driver         = {
                .name   = "at91_i2c",

diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index 902e420e761ef5f53d280bc965a6503c07bdcf0a..b78b38ddac463b5b70d17255be994ac47602ca66 100644 (file)
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -368,7 +368,7 @@ static struct platform_driver au1xpsc_smbus_driver = {
                .pm     = pm_sleep_ptr(&i2c_au1550_pmops),
        },
        .probe          = i2c_au1550_probe,
-       .remove_new     = i2c_au1550_remove,
+       .remove         = i2c_au1550_remove,
 };
 
 module_platform_driver(au1xpsc_smbus_driver);

diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
index a66f7f67b3b880b97a3365573873da18c174b6f7..48916cf45ff730fd7b9e6996453ae167118dc563 100644 (file)
--- a/drivers/i2c/busses/i2c-axxia.c
+++ b/drivers/i2c/busses/i2c-axxia.c
@@ -824,7 +824,7 @@ MODULE_DEVICE_TABLE(of, axxia_i2c_of_match);
 
 static struct platform_driver axxia_i2c_driver = {
        .probe = axxia_i2c_probe,
-       .remove_new = axxia_i2c_remove,
+       .remove = axxia_i2c_remove,
        .driver = {
                .name = "axxia-i2c",
                .of_match_table = axxia_i2c_of_match,

diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c
index 133d02899c6bd77bd04a648cbf20c60abd43044d..15b632a146e1e257671d45573ce1a081588c9cc6 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm-iproc.c
+++ b/drivers/i2c/busses/i2c-bcm-iproc.c
@@ -1264,7 +1264,7 @@ static struct platform_driver bcm_iproc_i2c_driver = {
                .pm = pm_sleep_ptr(&bcm_iproc_i2c_pm_ops),
        },
        .probe = bcm_iproc_i2c_probe,
-       .remove_new = bcm_iproc_i2c_remove,
+       .remove = bcm_iproc_i2c_remove,
 };
 module_platform_driver(bcm_iproc_i2c_driver);
 

diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm-kona.c
index eb5c46a8f824e43b6df3493cd4959c38f761ca6a..340fe1305dd924adc5e3ce59e75a5e08be2a76e3 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm-kona.c
+++ b/drivers/i2c/busses/i2c-bcm-kona.c
@@ -877,7 +877,7 @@ static struct platform_driver bcm_kona_i2c_driver = {
                   .of_match_table = bcm_kona_i2c_of_match,
                   },
        .probe = bcm_kona_i2c_probe,
-       .remove_new = bcm_kona_i2c_remove,
+       .remove = bcm_kona_i2c_remove,
 };
 module_platform_driver(bcm_kona_i2c_driver);
 

diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index ae42e37052a88675603cf6e71710591f68fe0ebf..8554e790f8e36c5a1cf56c0aab8556b377f2bbdf 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -520,7 +520,7 @@ MODULE_DEVICE_TABLE(of, bcm2835_i2c_of_match);
 
 static struct platform_driver bcm2835_i2c_driver = {
        .probe          = bcm2835_i2c_probe,
-       .remove_new     = bcm2835_i2c_remove,
+       .remove         = bcm2835_i2c_remove,
        .driver         = {
                .name   = "i2c-bcm2835",
                .of_match_table = bcm2835_i2c_of_match,

diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
index 83b85011e3771b5519860441c14ef7d808179432..00f1a046e985353d5cbdd37e6a2e1b334b2738e7 100644 (file)
--- a/drivers/i2c/busses/i2c-brcmstb.c
+++ b/drivers/i2c/busses/i2c-brcmstb.c
@@ -744,7 +744,7 @@ static struct platform_driver brcmstb_i2c_driver = {
                   .pm = pm_sleep_ptr(&brcmstb_i2c_pm),
                   },
        .probe = brcmstb_i2c_probe,
-       .remove_new = brcmstb_i2c_remove,
+       .remove = brcmstb_i2c_remove,
 };
 module_platform_driver(brcmstb_i2c_driver);
 

diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c
index ee2f32cd54ce4de5c4ac414067909d8541db0c1e..b64026fbca665b21b70b9bbce14d98baeedcfdfc 100644 (file)
--- a/drivers/i2c/busses/i2c-cadence.c
+++ b/drivers/i2c/busses/i2c-cadence.c
@@ -1652,7 +1652,7 @@ static struct platform_driver cdns_i2c_drv = {
                .pm = &cdns_i2c_dev_pm_ops,
        },
        .probe  = cdns_i2c_probe,
-       .remove_new = cdns_i2c_remove,
+       .remove = cdns_i2c_remove,
 };
 
 module_platform_driver(cdns_i2c_drv);

diff --git a/drivers/i2c/busses/i2c-cbus-gpio.c b/drivers/i2c/busses/i2c-cbus-gpio.c
index fdc1758a32756e943dd2d304e7582c584300a511..8065c7e4462e8ebe4928d04f0f48e1d0772dbb3e 100644 (file)
--- a/drivers/i2c/busses/i2c-cbus-gpio.c
+++ b/drivers/i2c/busses/i2c-cbus-gpio.c
@@ -264,7 +264,7 @@ MODULE_DEVICE_TABLE(of, i2c_cbus_dt_ids);
 
 static struct platform_driver cbus_i2c_driver = {
        .probe  = cbus_i2c_probe,
-       .remove_new = cbus_i2c_remove,
+       .remove = cbus_i2c_remove,
        .driver = {
                .name   = "i2c-cbus-gpio",
                .of_match_table = of_match_ptr(i2c_cbus_dt_ids),

diff --git a/drivers/i2c/busses/i2c-cht-wc.c b/drivers/i2c/busses/i2c-cht-wc.c
index 52e3000626c5a162a6a760dfd8bed763c5215988..26a36a65521e732f58c4b78030aba4bfc1f98350 100644 (file)
--- a/drivers/i2c/busses/i2c-cht-wc.c
+++ b/drivers/i2c/busses/i2c-cht-wc.c
@@ -546,7 +546,7 @@ MODULE_DEVICE_TABLE(platform, cht_wc_i2c_adap_id_table);
 
 static struct platform_driver cht_wc_i2c_adap_driver = {
        .probe = cht_wc_i2c_adap_i2c_probe,
-       .remove_new = cht_wc_i2c_adap_i2c_remove,
+       .remove = cht_wc_i2c_adap_i2c_remove,
        .driver = {
                .name = "cht_wcove_ext_chgr",
        },

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 4794ec066eb01efdaa83f7e53bb623c392a3aa2e..260e1643c2cc0fd448dfb93cadde83e54862d29d 100644 (file)
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -701,7 +701,7 @@ MODULE_DEVICE_TABLE(of, cpm_i2c_match);
 
 static struct platform_driver cpm_i2c_driver = {
        .probe          = cpm_i2c_probe,
-       .remove_new     = cpm_i2c_remove,
+       .remove         = cpm_i2c_remove,
        .driver = {
                .name = "fsl-i2c-cpm",
                .of_match_table = cpm_i2c_match,

diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
index ab2688bd4d338a5d35cf2c21bc72e3dcb7169d29..43bf90d90eebabe88af2d6a32a299da9175799e9 100644 (file)
--- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c
+++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
@@ -304,7 +304,7 @@ MODULE_DEVICE_TABLE(acpi, cros_ec_i2c_tunnel_acpi_id);
 
 static struct platform_driver ec_i2c_tunnel_driver = {
        .probe = ec_i2c_probe,
-       .remove_new = ec_i2c_remove,
+       .remove = ec_i2c_remove,
        .driver = {
                .name = "cros-ec-i2c-tunnel",
                .acpi_match_table = ACPI_PTR(cros_ec_i2c_tunnel_acpi_id),

diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index c4fb5e9ab50611b0c6e536786fcd023a0c4743fd..71dc0a6688b7acf4babfdbaf48f0d19f080e2d23 100644 (file)
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -935,7 +935,7 @@ MODULE_DEVICE_TABLE(platform, davinci_i2c_driver_ids);
 
 static struct platform_driver davinci_i2c_driver = {
        .probe          = davinci_i2c_probe,
-       .remove_new     = davinci_i2c_remove,
+       .remove         = davinci_i2c_remove,
        .id_table       = davinci_i2c_driver_ids,
        .driver         = {
                .name   = "i2c_davinci",

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index b44c5d1a6748176c0824ef1b4b928683fe18aa87..f722ffc13c2208373005f856bd7648596a162648 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -370,7 +370,7 @@ MODULE_DEVICE_TABLE(platform, dw_i2c_platform_ids);
 
 static struct platform_driver dw_i2c_driver = {
        .probe = dw_i2c_plat_probe,
-       .remove_new = dw_i2c_plat_remove,
+       .remove = dw_i2c_plat_remove,
        .driver         = {
                .name   = "i2c_designware",
                .of_match_table = dw_i2c_of_match,

diff --git a/drivers/i2c/busses/i2c-digicolor.c b/drivers/i2c/busses/i2c-digicolor.c
index 3dc5a46698fc953c71dc12f661cc069acbb616f1..38d7f31aee79c13b6d8a0be9ad99e98b26f19d9f 100644 (file)
--- a/drivers/i2c/busses/i2c-digicolor.c
+++ b/drivers/i2c/busses/i2c-digicolor.c
@@ -363,7 +363,7 @@ MODULE_DEVICE_TABLE(of, dc_i2c_match);
 
 static struct platform_driver dc_i2c_driver = {
        .probe   = dc_i2c_probe,
-       .remove_new = dc_i2c_remove,
+       .remove = dc_i2c_remove,
        .driver  = {
                .name  = "digicolor-i2c",
                .of_match_table = dc_i2c_match,

diff --git a/drivers/i2c/busses/i2c-dln2.c b/drivers/i2c/busses/i2c-dln2.c
index 11ed055143d344c3f79d1e3c751b0025231f2584..bde2ef09886268150d26d1ee73429a652fef605e 100644 (file)
--- a/drivers/i2c/busses/i2c-dln2.c
+++ b/drivers/i2c/busses/i2c-dln2.c
@@ -245,7 +245,7 @@ static void dln2_i2c_remove(struct platform_device *pdev)
 static struct platform_driver dln2_i2c_driver = {
        .driver.name    = "dln2-i2c",
        .probe          = dln2_i2c_probe,
-       .remove_new     = dln2_i2c_remove,
+       .remove         = dln2_i2c_remove,
 };
 
 module_platform_driver(dln2_i2c_driver);

diff --git a/drivers/i2c/busses/i2c-emev2.c b/drivers/i2c/busses/i2c-emev2.c
index d08be3f3cede3d44b3a96488afc9e298b465a7b0..2512cef8e2a2923cdff0c635c8df0dc3a1b550de 100644 (file)
--- a/drivers/i2c/busses/i2c-emev2.c
+++ b/drivers/i2c/busses/i2c-emev2.c
@@ -425,7 +425,7 @@ static const struct of_device_id em_i2c_ids[] = {
 
 static struct platform_driver em_i2c_driver = {
        .probe = em_i2c_probe,
-       .remove_new = em_i2c_remove,
+       .remove = em_i2c_remove,
        .driver = {
                .name = "em-i2c",
                .of_match_table = em_i2c_ids,

diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
index d8baca9b610c3b5a6d000978e5bcd162f05ba9ed..e330015087ab8fee2b258a6d48a2f175ee94faaf 100644 (file)
--- a/drivers/i2c/busses/i2c-exynos5.c
+++ b/drivers/i2c/busses/i2c-exynos5.c
@@ -1009,7 +1009,7 @@ static const struct dev_pm_ops exynos5_i2c_dev_pm_ops = {
 
 static struct platform_driver exynos5_i2c_driver = {
        .probe          = exynos5_i2c_probe,
-       .remove_new     = exynos5_i2c_remove,
+       .remove         = exynos5_i2c_remove,
        .driver         = {
                .name   = "exynos5-hsi2c",
                .pm     = pm_sleep_ptr(&exynos5_i2c_dev_pm_ops),

diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index e0bd218e2f146cdf49a6a7327a628c3f747add5b..f4355b17bfbf15c402e71096ccbb99f5a35bb479 100644 (file)
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -481,7 +481,7 @@ static struct platform_driver i2c_gpio_driver = {
                .acpi_match_table = i2c_gpio_acpi_match,
        },
        .probe          = i2c_gpio_probe,
-       .remove_new     = i2c_gpio_remove,
+       .remove         = i2c_gpio_remove,
 };
 
 static int __init i2c_gpio_init(void)

diff --git a/drivers/i2c/busses/i2c-gxp.c b/drivers/i2c/busses/i2c-gxp.c
index efafc0528c44da12155bd1c0d18fa1a667550135..0fc39caa6c871e5fe5e86b25661ab857fe99d77d 100644 (file)
--- a/drivers/i2c/busses/i2c-gxp.c
+++ b/drivers/i2c/busses/i2c-gxp.c
@@ -595,7 +595,7 @@ MODULE_DEVICE_TABLE(of, gxp_i2c_of_match);
 
 static struct platform_driver gxp_i2c_driver = {
        .probe  = gxp_i2c_probe,
-       .remove_new = gxp_i2c_remove,
+       .remove = gxp_i2c_remove,
        .driver = {
                .name = "gxp-i2c",
                .of_match_table = gxp_i2c_of_match,

diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index ec1ebacb9aa8d1a935c8481ec7e0dbc6713c8449..78c5845e0877ae3e2ad1dcef052cdef021372e12 100644 (file)
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -454,7 +454,7 @@ static struct platform_driver highlander_i2c_driver = {
        },
 
        .probe          = highlander_i2c_probe,
-       .remove_new     = highlander_i2c_remove,
+       .remove         = highlander_i2c_remove,
 };
 
 module_platform_driver(highlander_i2c_driver);

diff --git a/drivers/i2c/busses/i2c-hix5hd2.c b/drivers/i2c/busses/i2c-hix5hd2.c
index 64cade6ba92344f0ed6cb57163552c718b58ca4a..370f329747637c624cabebb7487c266b4dbcb6f5 100644 (file)
--- a/drivers/i2c/busses/i2c-hix5hd2.c
+++ b/drivers/i2c/busses/i2c-hix5hd2.c
@@ -508,7 +508,7 @@ MODULE_DEVICE_TABLE(of, hix5hd2_i2c_match);
 
 static struct platform_driver hix5hd2_i2c_driver = {
        .probe          = hix5hd2_i2c_probe,
-       .remove_new     = hix5hd2_i2c_remove,
+       .remove         = hix5hd2_i2c_remove,
        .driver         = {
                .name   = "hix5hd2-i2c",
                .pm     = pm_ptr(&hix5hd2_i2c_pm_ops),

diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 82dedb1bb5bee72c55a7c6c989f388e4c25a509e..c76c4116ddc736e50ed3fb9e3674fe18d28d1e64 100644 (file)
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -790,7 +790,7 @@ static struct platform_driver ibm_iic_driver = {
                .of_match_table = ibm_iic_match,
        },
        .probe  = iic_probe,
-       .remove_new = iic_remove,
+       .remove = iic_remove,
 };
 
 module_platform_driver(ibm_iic_driver);

diff --git a/drivers/i2c/busses/i2c-img-scb.c b/drivers/i2c/busses/i2c-img-scb.c
index e0e87185f6bbfc7abb18d681a414b73fac0b4a92..02f75cf310aaa7219a41f1650c1e1a0f6ba4ca62 100644 (file)
--- a/drivers/i2c/busses/i2c-img-scb.c
+++ b/drivers/i2c/busses/i2c-img-scb.c
@@ -1497,7 +1497,7 @@ static struct platform_driver img_scb_i2c_driver = {
                .pm             = pm_ptr(&img_i2c_pm),
        },
        .probe = img_i2c_probe,
-       .remove_new = img_i2c_remove,
+       .remove = img_i2c_remove,
 };
 module_platform_driver(img_scb_i2c_driver);
 

diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c
index 976d43f73f3830e30c6353836a3e35f6240791e1..8adf2963d764eb7c70f3751517290573185a53c5 100644 (file)
--- a/drivers/i2c/busses/i2c-imx-lpi2c.c
+++ b/drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -703,7 +703,7 @@ static const struct dev_pm_ops lpi2c_pm_ops = {
 
 static struct platform_driver lpi2c_imx_driver = {
        .probe = lpi2c_imx_probe,
-       .remove_new = lpi2c_imx_remove,
+       .remove = lpi2c_imx_remove,
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = lpi2c_imx_of_match,

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 98539313cbc9701c23ffa855750c5eaed21fd275..c2358356a8ffd06eb2718151427a2fcc72b6ad3e 100644 (file)
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1576,7 +1576,7 @@ static const struct dev_pm_ops i2c_imx_pm_ops = {
 
 static struct platform_driver i2c_imx_driver = {
        .probe = i2c_imx_probe,
-       .remove_new = i2c_imx_remove,
+       .remove = i2c_imx_remove,
        .driver = {
                .name = DRIVER_NAME,
                .pm = pm_ptr(&i2c_imx_pm_ops),

diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 859c14e340e7e3541daec39528671349103946ea..ce5ca5b90b395a7945e4825f64f8d5cbabda284c 100644 (file)
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -524,7 +524,7 @@ MODULE_DEVICE_TABLE(of, i2c_iop3xx_match);
 
 static struct platform_driver iop3xx_i2c_driver = {
        .probe          = iop3xx_i2c_probe,
-       .remove_new     = iop3xx_i2c_remove,
+       .remove         = iop3xx_i2c_remove,
        .driver         = {
                .name   = "IOP3xx-I2C",
                .of_match_table = i2c_iop3xx_match,

diff --git a/drivers/i2c/busses/i2c-jz4780.c b/drivers/i2c/busses/i2c-jz4780.c
index 92cc5b09113760f883d0eac1674868535a061b58..664a5471d9335781ee5f361add84380ebb35b012 100644 (file)
--- a/drivers/i2c/busses/i2c-jz4780.c
+++ b/drivers/i2c/busses/i2c-jz4780.c
@@ -847,7 +847,7 @@ static void jz4780_i2c_remove(struct platform_device *pdev)
 
 static struct platform_driver jz4780_i2c_driver = {
        .probe          = jz4780_i2c_probe,
-       .remove_new     = jz4780_i2c_remove,
+       .remove         = jz4780_i2c_remove,
        .driver         = {
                .name   = "jz4780-i2c",
                .of_match_table = jz4780_i2c_of_matches,

diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c
index eb66942e0b7d00af03cd82a75573034fc36b3e4b..212196af68ba7660c2f2576f38ba4a14dffb2b9b 100644 (file)
--- a/drivers/i2c/busses/i2c-kempld.c
+++ b/drivers/i2c/busses/i2c-kempld.c
@@ -385,7 +385,7 @@ static struct platform_driver kempld_i2c_driver = {
                .pm = pm_sleep_ptr(&kempld_i2c_pm_ops),
        },
        .probe          = kempld_i2c_probe,
-       .remove_new     = kempld_i2c_remove,
+       .remove         = kempld_i2c_remove,
 };
 
 module_platform_driver(kempld_i2c_driver);

diff --git a/drivers/i2c/busses/i2c-lpc2k.c b/drivers/i2c/busses/i2c-lpc2k.c
index 9fb33cbf741940635c95ed5738c0e7c8f7c1cec6..6943a0de860ad0bb4020680f1e40220b42cc89a7 100644 (file)
--- a/drivers/i2c/busses/i2c-lpc2k.c
+++ b/drivers/i2c/busses/i2c-lpc2k.c
@@ -462,7 +462,7 @@ MODULE_DEVICE_TABLE(of, lpc2k_i2c_match);
 
 static struct platform_driver i2c_lpc2k_driver = {
        .probe  = i2c_lpc2k_probe,
-       .remove_new = i2c_lpc2k_remove,
+       .remove = i2c_lpc2k_remove,
        .driver = {
                .name           = "lpc2k-i2c",
                .pm             = pm_sleep_ptr(&i2c_lpc2k_dev_pm_ops),

diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index c7b203cc4434518616d3535b1cb1e6c56aae853a..e1d69537353bf6ca8551786922817f4f03fd6a8c 100644 (file)
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -565,7 +565,7 @@ MODULE_DEVICE_TABLE(of, meson_i2c_match);
 
 static struct platform_driver meson_i2c_driver = {
        .probe   = meson_i2c_probe,
-       .remove_new = meson_i2c_remove,
+       .remove = meson_i2c_remove,
        .driver  = {
                .name  = "meson-i2c",
                .of_match_table = meson_i2c_match,

diff --git a/drivers/i2c/busses/i2c-microchip-corei2c.c b/drivers/i2c/busses/i2c-microchip-corei2c.c
index 0b0a1c4d17caef75b4b7da236ec4c383d68a8ae0..d1543e7d838086858fb53e0a1dcfcc29d5e46d76 100644 (file)
--- a/drivers/i2c/busses/i2c-microchip-corei2c.c
+++ b/drivers/i2c/busses/i2c-microchip-corei2c.c
@@ -462,7 +462,7 @@ MODULE_DEVICE_TABLE(of, mchp_corei2c_of_match);
 
 static struct platform_driver mchp_corei2c_driver = {
        .probe = mchp_corei2c_probe,
-       .remove_new = mchp_corei2c_remove,
+       .remove = mchp_corei2c_remove,
        .driver = {
                .name = "microchip-corei2c",
                .of_match_table = mchp_corei2c_of_match,

diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c
index b3a73921ab699cbe3b9bdc8dd847452aeeeb4703..21f67f3b65b6eb2460daa667b2f05832149914c0 100644 (file)
--- a/drivers/i2c/busses/i2c-mlxbf.c
+++ b/drivers/i2c/busses/i2c-mlxbf.c
@@ -2456,7 +2456,7 @@ static void mlxbf_i2c_remove(struct platform_device *pdev)
 
 static struct platform_driver mlxbf_i2c_driver = {
        .probe = mlxbf_i2c_probe,
-       .remove_new = mlxbf_i2c_remove,
+       .remove = mlxbf_i2c_remove,
        .driver = {
                .name = "i2c-mlxbf",
                .acpi_match_table = ACPI_PTR(mlxbf_i2c_acpi_ids),

diff --git a/drivers/i2c/busses/i2c-mlxcpld.c b/drivers/i2c/busses/i2c-mlxcpld.c
index 8223f6d29eb3b22f5fc40156fda4f67d7f91b828..07d3cadbf5102a757cdd51e593170244341738cf 100644 (file)
--- a/drivers/i2c/busses/i2c-mlxcpld.c
+++ b/drivers/i2c/busses/i2c-mlxcpld.c
@@ -591,7 +591,7 @@ static void mlxcpld_i2c_remove(struct platform_device *pdev)
 
 static struct platform_driver mlxcpld_i2c_driver = {
        .probe          = mlxcpld_i2c_probe,
-       .remove_new     = mlxcpld_i2c_remove,
+       .remove         = mlxcpld_i2c_remove,
        .driver = {
                .name = MLXCPLD_I2C_DEVICE_NAME,
        },

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 236d6b8ba867578aa9421523b5ae59f5d175bdf6..28c5c5c1fb7a67b2eacdef7e609a28b71a0be5a6 100644 (file)
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -938,7 +938,7 @@ MODULE_DEVICE_TABLE(of, mpc_i2c_of_match);
 /* Structure for a device driver */
 static struct platform_driver mpc_i2c_driver = {
        .probe          = fsl_i2c_probe,
-       .remove_new     = fsl_i2c_remove,
+       .remove         = fsl_i2c_remove,
        .driver = {
                .name = "mpc-i2c",
                .of_match_table = mpc_i2c_of_match,

diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index e0ba653dec2d67c3d6d866fd595dce3be5a5a512..5bd342047d599e15f65bcd82669d174414cafd96 100644 (file)
--- a/drivers/i2c/busses/i2c-mt65xx.c
+++ b/drivers/i2c/busses/i2c-mt65xx.c
@@ -1550,7 +1550,7 @@ static const struct dev_pm_ops mtk_i2c_pm = {
 
 static struct platform_driver mtk_i2c_driver = {
        .probe = mtk_i2c_probe,
-       .remove_new = mtk_i2c_remove,
+       .remove = mtk_i2c_remove,
        .driver = {
                .name = I2C_DRV_NAME,
                .pm = pm_sleep_ptr(&mtk_i2c_pm),

diff --git a/drivers/i2c/busses/i2c-mt7621.c b/drivers/i2c/busses/i2c-mt7621.c
index 23d417ff5e71c85e9101b99dcb6a82910c55134f..2103f21f9dddada3ea04fc8ee8ad3afa9c811775 100644 (file)
--- a/drivers/i2c/busses/i2c-mt7621.c
+++ b/drivers/i2c/busses/i2c-mt7621.c
@@ -331,7 +331,7 @@ static void mtk_i2c_remove(struct platform_device *pdev)
 
 static struct platform_driver mtk_i2c_driver = {
        .probe          = mtk_i2c_probe,
-       .remove_new     = mtk_i2c_remove,
+       .remove         = mtk_i2c_remove,
        .driver         = {
                .name   = "i2c-mt7621",
                .of_match_table = i2c_mtk_dt_ids,

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 29f94efedf605a499b3be173a6da7f039aea4a55..874309580c33c372d82038bee9ace84bf1bce785 100644 (file)
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -1104,7 +1104,7 @@ static const struct dev_pm_ops mv64xxx_i2c_pm_ops = {
 
 static struct platform_driver mv64xxx_i2c_driver = {
        .probe  = mv64xxx_i2c_probe,
-       .remove_new = mv64xxx_i2c_remove,
+       .remove = mv64xxx_i2c_remove,
        .driver = {
                .name   = MV64XXX_I2C_CTLR_NAME,
                .pm     = &mv64xxx_i2c_pm_ops,

diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
index 36def0a9c95c4fbc6fcc025a534c44e1692c9d06..ad62d56b2186e08595e1de0b867e80f7ad7cb5ac 100644 (file)
--- a/drivers/i2c/busses/i2c-mxs.c
+++ b/drivers/i2c/busses/i2c-mxs.c
@@ -881,7 +881,7 @@ static struct platform_driver mxs_i2c_driver = {
                   .of_match_table = mxs_i2c_dt_ids,
                   },
        .probe = mxs_i2c_probe,
-       .remove_new = mxs_i2c_remove,
+       .remove = mxs_i2c_remove,
 };
 
 static int __init mxs_i2c_init(void)

diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c
index 7620bdcdc235b8d0dba4e5b7cc15ba4afd1b63eb..482a0074d448cb0767689e1926480bdbfb83c56d 100644 (file)
--- a/drivers/i2c/busses/i2c-npcm7xx.c
+++ b/drivers/i2c/busses/i2c-npcm7xx.c
@@ -2373,7 +2373,7 @@ MODULE_DEVICE_TABLE(of, npcm_i2c_bus_of_table);
 
 static struct platform_driver npcm_i2c_bus_driver = {
        .probe = npcm_i2c_probe_bus,
-       .remove_new = npcm_i2c_remove_bus,
+       .remove = npcm_i2c_remove_bus,
        .driver = {
                .name = "nuvoton-i2c",
                .of_match_table = npcm_i2c_bus_of_table,

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index 482b37c8a12970438400960bc667e6f7331e0e54..0f67e57cdeff6cfcbd68522d467fcf289959f4b0 100644 (file)
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -769,7 +769,7 @@ static DEFINE_NOIRQ_DEV_PM_OPS(ocores_i2c_pm,
 
 static struct platform_driver ocores_i2c_driver = {
        .probe   = ocores_i2c_probe,
-       .remove_new = ocores_i2c_remove,
+       .remove = ocores_i2c_remove,
        .driver  = {
                .name = "ocores-i2c",
                .of_match_table = ocores_i2c_match,

diff --git a/drivers/i2c/busses/i2c-octeon-platdrv.c b/drivers/i2c/busses/i2c-octeon-platdrv.c
index dc6dff95c68ce7ad87bbee0b0d7f8c8d8b1e84f6..edfca7b20f291674bb9b89951b776ebfb59bf2a7 100644 (file)
--- a/drivers/i2c/busses/i2c-octeon-platdrv.c
+++ b/drivers/i2c/busses/i2c-octeon-platdrv.c
@@ -269,7 +269,7 @@ MODULE_DEVICE_TABLE(of, octeon_i2c_match);
 
 static struct platform_driver octeon_i2c_driver = {
        .probe          = octeon_i2c_probe,
-       .remove_new     = octeon_i2c_remove,
+       .remove         = octeon_i2c_remove,
        .driver         = {
                .name   = DRV_NAME,
                .of_match_table = octeon_i2c_match,

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 1d9ad25c89ae5586eba7afb5f6f7c477215c0b90..92faf03d64cfb6539b1a2392343fd4aec57ce775 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1605,7 +1605,7 @@ static const struct dev_pm_ops omap_i2c_pm_ops = {
 
 static struct platform_driver omap_i2c_driver = {
        .probe          = omap_i2c_probe,
-       .remove_new     = omap_i2c_remove,
+       .remove         = omap_i2c_remove,
        .driver         = {
                .name   = "omap_i2c",
                .pm     = pm_ptr(&omap_i2c_pm_ops),

diff --git a/drivers/i2c/busses/i2c-opal.c b/drivers/i2c/busses/i2c-opal.c
index d9dd71cf37fd29f5d7aca4a386084a7d98abc9ba..c9b62892397a0f908206d1b0b7b7e02a8cfba0cb 100644 (file)
--- a/drivers/i2c/busses/i2c-opal.c
+++ b/drivers/i2c/busses/i2c-opal.c
@@ -249,7 +249,7 @@ MODULE_DEVICE_TABLE(of, i2c_opal_of_match);
 
 static struct platform_driver i2c_opal_driver = {
        .probe  = i2c_opal_probe,
-       .remove_new = i2c_opal_remove,
+       .remove = i2c_opal_remove,
        .driver = {
                .name           = "i2c-opal",
                .of_match_table = i2c_opal_of_match,

diff --git a/drivers/i2c/busses/i2c-pasemi-platform.c b/drivers/i2c/busses/i2c-pasemi-platform.c
index 5fbfb9b41744022c9eb4d09c56331efa09e4efaf..a486a37d386345ebd491f6fb82cd4e7d2ef990cf 100644 (file)
--- a/drivers/i2c/busses/i2c-pasemi-platform.c
+++ b/drivers/i2c/busses/i2c-pasemi-platform.c
@@ -104,7 +104,7 @@ static struct platform_driver pasemi_platform_i2c_driver = {
                .of_match_table         = pasemi_platform_i2c_of_match,
        },
        .probe  = pasemi_platform_i2c_probe,
-       .remove_new = pasemi_platform_i2c_remove,
+       .remove = pasemi_platform_i2c_remove,
 };
 module_platform_driver(pasemi_platform_i2c_driver);
 

diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index b8d5480c54f65a1615b8a5963ef005cb09eac5bd..87da8241b92707b74f034d2cc38fb3470d598d1f 100644 (file)
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -238,7 +238,7 @@ MODULE_DEVICE_TABLE(of, i2c_pca_of_match_table);
 
 static struct platform_driver i2c_pca_pf_driver = {
        .probe = i2c_pca_pf_probe,
-       .remove_new = i2c_pca_pf_remove,
+       .remove = i2c_pca_pf_remove,
        .driver = {
                .name = "i2c-pca-platform",
                .of_match_table = of_match_ptr(i2c_pca_of_match_table),

diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 1dafadda73af3ac596e9ba680b113a8764c9c778..d4d139b975131b3f4feb493f4baed1f2c51f1b91 100644 (file)
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -733,7 +733,7 @@ static struct platform_driver i2c_pnx_driver = {
                .pm = pm_sleep_ptr(&i2c_pnx_pm),
        },
        .probe = i2c_pnx_probe,
-       .remove_new = i2c_pnx_remove,
+       .remove = i2c_pnx_remove,
 };
 
 static int __init i2c_adap_pnx_init(void)

diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index b6b03539f62688b2e1333f5049b54729feec5688..9a867c817db01eaf5ac6b8b3023667aad04ed782 100644 (file)
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -437,7 +437,7 @@ static int i2c_powermac_probe(struct platform_device *dev)
 
 static struct platform_driver i2c_powermac_driver = {
        .probe = i2c_powermac_probe,
-       .remove_new = i2c_powermac_remove,
+       .remove = i2c_powermac_remove,
        .driver = {
                .name = "i2c-powermac",
                .bus = &platform_bus_type,

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 4d76e71cdd4be1c06dcf78c7c6813454d08cedf8..cb69884826739d05705bf5954709d184c8516d9c 100644 (file)
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1574,7 +1574,7 @@ static const struct dev_pm_ops i2c_pxa_dev_pm_ops = {
 
 static struct platform_driver i2c_pxa_driver = {
        .probe          = i2c_pxa_probe,
-       .remove_new     = i2c_pxa_remove,
+       .remove         = i2c_pxa_remove,
        .driver         = {
                .name   = "pxa2xx-i2c",
                .pm     = pm_sleep_ptr(&i2c_pxa_dev_pm_ops),

diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c
index 99e4305a33733e696c975a8b7389c9660b72eb65..5cc791b3b57d3000d7a2f8707d58ae2eef39a46d 100644 (file)
--- a/drivers/i2c/busses/i2c-qcom-cci.c
+++ b/drivers/i2c/busses/i2c-qcom-cci.c
@@ -818,7 +818,7 @@ MODULE_DEVICE_TABLE(of, cci_dt_match);
 
 static struct platform_driver qcom_cci_driver = {
        .probe  = cci_probe,
-       .remove_new = cci_remove,
+       .remove = cci_remove,
        .driver = {
                .name = "i2c-qcom-cci",
                .of_match_table = cci_dt_match,

diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
index 579c01686823f7835b99921a00eb2d2242e830a5..59f2e055d843814244f084cf0d254fe7144c6e3a 100644 (file)
--- a/drivers/i2c/busses/i2c-qcom-geni.c
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
@@ -1064,7 +1064,7 @@ MODULE_DEVICE_TABLE(of, geni_i2c_dt_match);
 
 static struct platform_driver geni_i2c_driver = {
        .probe  = geni_i2c_probe,
-       .remove_new = geni_i2c_remove,
+       .remove = geni_i2c_remove,
        .shutdown = geni_i2c_shutdown,
        .driver = {
                .name = "geni_i2c",

diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
index d480162a4d3941042cb59eb69aec0e816276761a..86ec391616b06fba0a5a333776e2d009828cf3f1 100644 (file)
--- a/drivers/i2c/busses/i2c-qup.c
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -1974,7 +1974,7 @@ MODULE_DEVICE_TABLE(of, qup_i2c_dt_match);
 
 static struct platform_driver qup_i2c_driver = {
        .probe  = qup_i2c_probe,
-       .remove_new = qup_i2c_remove,
+       .remove = qup_i2c_remove,
        .driver = {
                .name = "i2c_qup",
                .pm = pm_ptr(&qup_i2c_qup_pm_ops),

diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 9267df38c2d0a124e7100d0126f7927547a51d3c..a7b77d14ee8671eb2b0b2a9caf606fd04d95ba0a 100644 (file)
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -1271,7 +1271,7 @@ static struct platform_driver rcar_i2c_driver = {
                .pm     = pm_sleep_ptr(&rcar_i2c_pm_ops),
        },
        .probe          = rcar_i2c_probe,
-       .remove_new     = rcar_i2c_remove,
+       .remove         = rcar_i2c_remove,
 };
 
 module_platform_driver(rcar_i2c_driver);

diff --git a/drivers/i2c/busses/i2c-riic.c b/drivers/i2c/busses/i2c-riic.c
index c7f3a4c02470238c16b1402f9017e2aa9423a5e3..c218f73c3650942c7ffb81bf7f361ad8c574bd12 100644 (file)
--- a/drivers/i2c/busses/i2c-riic.c
+++ b/drivers/i2c/busses/i2c-riic.c
@@ -632,7 +632,7 @@ static const struct of_device_id riic_i2c_dt_ids[] = {
 
 static struct platform_driver riic_i2c_driver = {
        .probe          = riic_i2c_probe,
-       .remove_new     = riic_i2c_remove,
+       .remove         = riic_i2c_remove,
        .driver         = {
                .name   = "i2c-riic",
                .of_match_table = riic_i2c_dt_ids,

diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index 4ef9bad77b856fc0c58aafba9c753f14cab0302b..d4e9196445c0302d93014bb6b90bf992f679977c 100644 (file)
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -1398,7 +1398,7 @@ static SIMPLE_DEV_PM_OPS(rk3x_i2c_pm_ops, NULL, rk3x_i2c_resume);
 
 static struct platform_driver rk3x_i2c_driver = {
        .probe   = rk3x_i2c_probe,
-       .remove_new = rk3x_i2c_remove,
+       .remove = rk3x_i2c_remove,
        .driver  = {
                .name  = "rk3x-i2c",
                .of_match_table = rk3x_i2c_match,

diff --git a/drivers/i2c/busses/i2c-rzv2m.c b/drivers/i2c/busses/i2c-rzv2m.c
index 8380a68538abc08a397835712e0a6e30cf21bbd1..02b76e24a4769805e33c75c7d59dab5ff6751f64 100644 (file)
--- a/drivers/i2c/busses/i2c-rzv2m.c
+++ b/drivers/i2c/busses/i2c-rzv2m.c
@@ -536,7 +536,7 @@ static struct platform_driver rzv2m_i2c_driver = {
                .pm = pm_sleep_ptr(&rzv2m_i2c_pm_ops),
        },
        .probe  = rzv2m_i2c_probe,
-       .remove_new = rzv2m_i2c_remove,
+       .remove = rzv2m_i2c_remove,
 };
 module_platform_driver(rzv2m_i2c_driver);
 

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 7698d9d59744831b6ba9fb1f9a550ffb7e99b631..0f3cf500df6823a3115e0ee3bff2a19aca72ab39 100644 (file)
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -1176,7 +1176,7 @@ static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = {
 
 static struct platform_driver s3c24xx_i2c_driver = {
        .probe          = s3c24xx_i2c_probe,
-       .remove_new     = s3c24xx_i2c_remove,
+       .remove         = s3c24xx_i2c_remove,
        .id_table       = s3c24xx_driver_ids,
        .driver         = {
                .name   = "s3c-i2c",

diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c
index d7af8e0d7599ec3abe8275c926a4a4ae2b90d84b..10a5146b3aa5fc6edb4c2f3e1cc57750041b7087 100644 (file)
--- a/drivers/i2c/busses/i2c-scmi.c
+++ b/drivers/i2c/busses/i2c-scmi.c
@@ -411,7 +411,7 @@ static void smbus_cmi_remove(struct platform_device *device)
 
 static struct platform_driver smbus_cmi_driver = {
        .probe = smbus_cmi_probe,
-       .remove_new = smbus_cmi_remove,
+       .remove = smbus_cmi_remove,
        .driver = {
                .name   = "smbus_cmi",
                .acpi_match_table = acpi_smbus_cmi_ids,

diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index 8a043f5fca1e067125be040ee13a587eb3aee7c9..620f1259676375a5da0c7196652fac777c02513c 100644 (file)
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -552,7 +552,7 @@ static struct platform_driver sh7760_i2c_drv = {
                .name   = SH7760_I2C_DEVNAME,
        },
        .probe          = sh7760_i2c_probe,
-       .remove_new     = sh7760_i2c_remove,
+       .remove         = sh7760_i2c_remove,
 };
 
 module_platform_driver(sh7760_i2c_drv);

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index f86c29737df124dd9d65e4b29ecaf17bd2d3bc5c..efe29621b8d7c17995e8339af767dc6207d4134c 100644 (file)
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -983,7 +983,7 @@ static struct platform_driver sh_mobile_i2c_driver = {
                .pm     = pm_sleep_ptr(&sh_mobile_i2c_pm_ops),
        },
        .probe          = sh_mobile_i2c_probe,
-       .remove_new     = sh_mobile_i2c_remove,
+       .remove         = sh_mobile_i2c_remove,
 };
 
 static int __init sh_mobile_i2c_adap_init(void)

diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c
index 18516bc64e046b93543fd0039df2851cd3c1bb51..d90606048611a05e156fabc5c826bf8419dca0fd 100644 (file)
--- a/drivers/i2c/busses/i2c-simtec.c
+++ b/drivers/i2c/busses/i2c-simtec.c
@@ -144,7 +144,7 @@ static struct platform_driver simtec_i2c_driver = {
                .name           = "simtec-i2c",
        },
        .probe          = simtec_i2c_probe,
-       .remove_new     = simtec_i2c_remove,
+       .remove         = simtec_i2c_remove,
 };
 
 module_platform_driver(simtec_i2c_driver);

diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c
index 9c45e75b918733fb84db446553ea6a892cbcb0b3..56b2e5c5fb49aa0da9061a9510f24e40a0d56759 100644 (file)
--- a/drivers/i2c/busses/i2c-sprd.c
+++ b/drivers/i2c/busses/i2c-sprd.c
@@ -643,7 +643,7 @@ MODULE_DEVICE_TABLE(of, sprd_i2c_of_match);
 
 static struct platform_driver sprd_i2c_driver = {
        .probe = sprd_i2c_probe,
-       .remove_new = sprd_i2c_remove,
+       .remove = sprd_i2c_remove,
        .driver = {
                   .name = "sprd-i2c",
                   .of_match_table = sprd_i2c_of_match,

diff --git a/drivers/i2c/busses/i2c-st.c b/drivers/i2c/busses/i2c-st.c
index 05b19ede65a0fee77d61ff3076e394860c0be4c8..750fff3d2389e6eb3db2ca1d6114a3654f374649 100644 (file)
--- a/drivers/i2c/busses/i2c-st.c
+++ b/drivers/i2c/busses/i2c-st.c
@@ -893,7 +893,7 @@ static struct platform_driver st_i2c_driver = {
                .pm = pm_sleep_ptr(&st_i2c_pm),
        },
        .probe = st_i2c_probe,
-       .remove_new = st_i2c_remove,
+       .remove = st_i2c_remove,
 };
 
 module_platform_driver(st_i2c_driver);

diff --git a/drivers/i2c/busses/i2c-stm32f4.c b/drivers/i2c/busses/i2c-stm32f4.c
index 230fff0c0bf93e4307d5a09d6055e60c0153fcb6..b3d56d0aa9d0b83ab522a5943d28cdf9e0d12475 100644 (file)
--- a/drivers/i2c/busses/i2c-stm32f4.c
+++ b/drivers/i2c/busses/i2c-stm32f4.c
@@ -869,7 +869,7 @@ static struct platform_driver stm32f4_i2c_driver = {
                .of_match_table = stm32f4_i2c_match,
        },
        .probe = stm32f4_i2c_probe,
-       .remove_new = stm32f4_i2c_remove,
+       .remove = stm32f4_i2c_remove,
 };
 
 module_platform_driver(stm32f4_i2c_driver);

diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index 0174ead99de6c1bd55b0cb0e3ccf74eec96bad9f..973a3a8c6d4a18644daabc22f7a244dbb2f5890e 100644 (file)
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -2532,7 +2532,7 @@ static struct platform_driver stm32f7_i2c_driver = {
                .pm = &stm32f7_i2c_pm_ops,
        },
        .probe = stm32f7_i2c_probe,
-       .remove_new = stm32f7_i2c_remove,
+       .remove = stm32f7_i2c_remove,
 };
 
 module_platform_driver(stm32f7_i2c_driver);

diff --git a/drivers/i2c/busses/i2c-sun6i-p2wi.c b/drivers/i2c/busses/i2c-sun6i-p2wi.c
index 074eade6c4a4fcb040cff6fccf9db1a8a6960dad..fb5280b8cf7fc0e3cba8ea6a318172ea2b011a02 100644 (file)
--- a/drivers/i2c/busses/i2c-sun6i-p2wi.c
+++ b/drivers/i2c/busses/i2c-sun6i-p2wi.c
@@ -319,7 +319,7 @@ static void p2wi_remove(struct platform_device *dev)
 
 static struct platform_driver p2wi_driver = {
        .probe  = p2wi_probe,
-       .remove_new = p2wi_remove,
+       .remove = p2wi_remove,
        .driver = {
                .name = "i2c-sunxi-p2wi",
                .of_match_table = p2wi_of_match_table,

diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c
index bbb9062669e4b2be7cc99081dbd3bf2cb9537677..31f8d08e32a4852206f7c47f9abf0a90b4473881 100644 (file)
--- a/drivers/i2c/busses/i2c-synquacer.c
+++ b/drivers/i2c/busses/i2c-synquacer.c
@@ -629,7 +629,7 @@ MODULE_DEVICE_TABLE(acpi, synquacer_i2c_acpi_ids);
 
 static struct platform_driver synquacer_i2c_driver = {
        .probe  = synquacer_i2c_probe,
-       .remove_new = synquacer_i2c_remove,
+       .remove = synquacer_i2c_remove,
        .driver = {
                .name = "synquacer_i2c",
                .of_match_table = of_match_ptr(synquacer_i2c_dt_ids),

diff --git a/drivers/i2c/busses/i2c-tegra-bpmp.c b/drivers/i2c/busses/i2c-tegra-bpmp.c
index dabadbcc6d6a2dc630546b6f7bd01f1a230b696a..bb0de6db6391bc2a262d8673c6aa65143a5d411c 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra-bpmp.c
+++ b/drivers/i2c/busses/i2c-tegra-bpmp.c
@@ -335,7 +335,7 @@ static struct platform_driver tegra_bpmp_i2c_driver = {
                .of_match_table = tegra_bpmp_i2c_of_match,
        },
        .probe = tegra_bpmp_i2c_probe,
-       .remove_new = tegra_bpmp_i2c_remove,
+       .remove = tegra_bpmp_i2c_remove,
 };
 module_platform_driver(tegra_bpmp_i2c_driver);
 

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 1df5b42041427c87753cd10739805412890cf726..87976e99e6d001e3a10e52c1219bd73cd34a2ac8 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -1964,7 +1964,7 @@ MODULE_DEVICE_TABLE(acpi, tegra_i2c_acpi_match);
 
 static struct platform_driver tegra_i2c_driver = {
        .probe = tegra_i2c_probe,
-       .remove_new = tegra_i2c_remove,
+       .remove = tegra_i2c_remove,
        .driver = {
                .name = "tegra-i2c",
                .of_match_table = tegra_i2c_of_match,

diff --git a/drivers/i2c/busses/i2c-uniphier-f.c b/drivers/i2c/busses/i2c-uniphier-f.c
index 10a99cd08972f444fe1676c55000457c2ac4ed45..d877f5a1f5798c06ae61764701aa2eef53d656d9 100644 (file)
--- a/drivers/i2c/busses/i2c-uniphier-f.c
+++ b/drivers/i2c/busses/i2c-uniphier-f.c
@@ -615,7 +615,7 @@ MODULE_DEVICE_TABLE(of, uniphier_fi2c_match);
 
 static struct platform_driver uniphier_fi2c_drv = {
        .probe  = uniphier_fi2c_probe,
-       .remove_new = uniphier_fi2c_remove,
+       .remove = uniphier_fi2c_remove,
        .driver = {
                .name  = "uniphier-fi2c",
                .of_match_table = uniphier_fi2c_match,

diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c
index ef575330746919864a7b28187e9190954704ee3a..b95d50d4d7db58efe9603e495b26bef123c5c6fc 100644 (file)
--- a/drivers/i2c/busses/i2c-uniphier.c
+++ b/drivers/i2c/busses/i2c-uniphier.c
@@ -409,7 +409,7 @@ MODULE_DEVICE_TABLE(of, uniphier_i2c_match);
 
 static struct platform_driver uniphier_i2c_drv = {
        .probe  = uniphier_i2c_probe,
-       .remove_new = uniphier_i2c_remove,
+       .remove = uniphier_i2c_remove,
        .driver = {
                .name  = "uniphier-i2c",
                .of_match_table = uniphier_i2c_match,

diff --git a/drivers/i2c/busses/i2c-versatile.c b/drivers/i2c/busses/i2c-versatile.c
index 76abfa77e200170196488f533430df0ed908036b..a1ab6ef6f0716df70e47514bc661eb5b3b854728 100644 (file)
--- a/drivers/i2c/busses/i2c-versatile.c
+++ b/drivers/i2c/busses/i2c-versatile.c
@@ -109,7 +109,7 @@ MODULE_DEVICE_TABLE(of, i2c_versatile_match);
 
 static struct platform_driver i2c_versatile_driver = {
        .probe          = i2c_versatile_probe,
-       .remove_new     = i2c_versatile_remove,
+       .remove         = i2c_versatile_remove,
        .driver         = {
                .name   = "versatile-i2c",
                .of_match_table = i2c_versatile_match,

diff --git a/drivers/i2c/busses/i2c-viai2c-wmt.c b/drivers/i2c/busses/i2c-viai2c-wmt.c
index 3415683dab91c57fba68bd110b9c54c0f0dfdfab..4eb740faf268d90675b16c813cd7a32c665c212a 100644 (file)
--- a/drivers/i2c/busses/i2c-viai2c-wmt.c
+++ b/drivers/i2c/busses/i2c-viai2c-wmt.c
@@ -169,7 +169,7 @@ static const struct of_device_id wmt_i2c_dt_ids[] = {
 
 static struct platform_driver wmt_i2c_driver = {
        .probe          = wmt_i2c_probe,
-       .remove_new     = wmt_i2c_remove,
+       .remove         = wmt_i2c_remove,
        .driver         = {
                .name   = "wmt-i2c",
                .of_match_table = wmt_i2c_dt_ids,

diff --git a/drivers/i2c/busses/i2c-viperboard.c b/drivers/i2c/busses/i2c-viperboard.c
index 2ed4130c033958df3eac989fa9197494e6a2c41f..503e2f4d6f8449f1d9cceb23e3f0f2b8ccfb76a6 100644 (file)
--- a/drivers/i2c/busses/i2c-viperboard.c
+++ b/drivers/i2c/busses/i2c-viperboard.c
@@ -415,7 +415,7 @@ static void vprbrd_i2c_remove(struct platform_device *pdev)
 static struct platform_driver vprbrd_i2c_driver = {
        .driver.name    = "viperboard-i2c",
        .probe          = vprbrd_i2c_probe,
-       .remove_new     = vprbrd_i2c_remove,
+       .remove         = vprbrd_i2c_remove,
 };
 
 static int __init vprbrd_i2c_init(void)

diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2c-xgene-slimpro.c
index 658396c9eeabf9861263fac60f944ed4eb8bbda0..663fe5604dd64b80e57f906e1f7430dcf6d5e95b 100644 (file)
--- a/drivers/i2c/busses/i2c-xgene-slimpro.c
+++ b/drivers/i2c/busses/i2c-xgene-slimpro.c
@@ -581,7 +581,7 @@ MODULE_DEVICE_TABLE(acpi, xgene_slimpro_i2c_acpi_ids);
 
 static struct platform_driver xgene_slimpro_i2c_driver = {
        .probe  = xgene_slimpro_i2c_probe,
-       .remove_new = xgene_slimpro_i2c_remove,
+       .remove = xgene_slimpro_i2c_remove,
        .driver = {
                .name   = "xgene-slimpro-i2c",
                .of_match_table = of_match_ptr(xgene_slimpro_i2c_dt_ids),

diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 1d68177241a6b3b513bf5d356b6b11ef65f15b53..c4d3eb02da09f454377df5ef03e38381aa541207 100644 (file)
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -1395,7 +1395,7 @@ static const struct dev_pm_ops xiic_dev_pm_ops = {
 
 static struct platform_driver xiic_i2c_driver = {
        .probe   = xiic_i2c_probe,
-       .remove_new = xiic_i2c_remove,
+       .remove = xiic_i2c_remove,
        .driver  = {
                .name = DRIVER_NAME,
                .of_match_table = of_match_ptr(xiic_of_match),

diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9xx.c
index 08a59a920929f38023f388afec96dfab425180fc..4d5e49b6321b81573def66ea3b120b522471164a 100644 (file)
--- a/drivers/i2c/busses/i2c-xlp9xx.c
+++ b/drivers/i2c/busses/i2c-xlp9xx.c
@@ -579,7 +579,7 @@ MODULE_DEVICE_TABLE(acpi, xlp9xx_i2c_acpi_ids);
 
 static struct platform_driver xlp9xx_i2c_driver = {
        .probe = xlp9xx_i2c_probe,
-       .remove_new = xlp9xx_i2c_remove,
+       .remove = xlp9xx_i2c_remove,
        .driver = {
                .name = "xlp9xx-i2c",
                .acpi_match_table = ACPI_PTR(xlp9xx_i2c_acpi_ids),

diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 3648382b885a4e0fc1b4248224a70c4a7fbd18eb..4d6abd7e92ce82fc9b28c9ec83ed1b5800bc8bbf 100644 (file)
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -536,7 +536,7 @@ static struct platform_driver scx200_pci_driver = {
                .name = "cs5535-smb",
        },
        .probe = scx200_probe,
-       .remove_new = scx200_remove,
+       .remove = scx200_remove,
 };
 
 static const struct pci_device_id scx200_isa[] = {

diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 7aa6e795d833d6c31f6978cdbd518dadaa4a8588..d6ef91b888c6a0e7a4c6be7a85639a6a8a0f9fe7 100644 (file)
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -190,7 +190,7 @@ MODULE_DEVICE_TABLE(of, i2c_arbitrator_of_match);
 
 static struct platform_driver i2c_arbitrator_driver = {
        .probe  = i2c_arbitrator_probe,
-       .remove_new = i2c_arbitrator_remove,
+       .remove = i2c_arbitrator_remove,
        .driver = {
                .name   = "i2c-arb-gpio-challenge",
                .of_match_table = i2c_arbitrator_of_match,

diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 7e2686b606c04d21bf4f078c875d51a72f0bce6d..dce18f763a09ba5288ad2d70bef4c5f860e4cd06 100644 (file)
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -314,7 +314,7 @@ static struct platform_driver i2c_demux_pinctrl_driver = {
                .of_match_table = i2c_demux_pinctrl_of_match,
        },
        .probe  = i2c_demux_pinctrl_probe,
-       .remove_new = i2c_demux_pinctrl_remove,
+       .remove = i2c_demux_pinctrl_remove,
 };
 module_platform_driver(i2c_demux_pinctrl_driver);
 

diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index 944577bb09c178ec46cf4ff5e57394012a0f9ea8..9b46b84e84fbdbff4bf6d82b652f84cc153ba411 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -247,7 +247,7 @@ MODULE_DEVICE_TABLE(of, i2c_mux_gpio_of_match);
 
 static struct platform_driver i2c_mux_gpio_driver = {
        .probe  = i2c_mux_gpio_probe,
-       .remove_new = i2c_mux_gpio_remove,
+       .remove = i2c_mux_gpio_remove,
        .driver = {
                .name   = "i2c-mux-gpio",
                .of_match_table = i2c_mux_gpio_of_match,

diff --git a/drivers/i2c/muxes/i2c-mux-gpmux.c b/drivers/i2c/muxes/i2c-mux-gpmux.c
index 10d63307b14d0108ccd7947cf302094c88467fc4..ab8e116610522dde6372aef5ac0f45dc8572708b 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-gpmux.c
+++ b/drivers/i2c/muxes/i2c-mux-gpmux.c
@@ -152,7 +152,7 @@ static void i2c_mux_remove(struct platform_device *pdev)
 
 static struct platform_driver i2c_mux_driver = {
        .probe  = i2c_mux_probe,
-       .remove_new = i2c_mux_remove,
+       .remove = i2c_mux_remove,
        .driver = {
                .name   = "i2c-mux-gpmux",
                .of_match_table = i2c_mux_of_match,

diff --git a/drivers/i2c/muxes/i2c-mux-mlxcpld.c b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
index 3f06aa3331a780ed28033137784349dd32bed432..1c2debcf379c31043eb47614b901a8a3b258125c 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-mlxcpld.c
+++ b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
@@ -182,7 +182,7 @@ static struct platform_driver mlxcpld_mux_driver = {
                .name = "i2c-mux-mlxcpld",
        },
        .probe = mlxcpld_mux_probe,
-       .remove_new = mlxcpld_mux_remove,
+       .remove = mlxcpld_mux_remove,
 };
 
 module_platform_driver(mlxcpld_mux_driver);

diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index 02aaf0781e9c8260a87d3abe1b7272991e486b98..fc686a350ae89f4eed823c63eb5c89bee48c1478 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -186,7 +186,7 @@ static struct platform_driver i2c_mux_pinctrl_driver = {
                .of_match_table = i2c_mux_pinctrl_of_match,
        },
        .probe  = i2c_mux_pinctrl_probe,
-       .remove_new = i2c_mux_pinctrl_remove,
+       .remove = i2c_mux_pinctrl_remove,
 };
 module_platform_driver(i2c_mux_pinctrl_driver);
 

diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c
index ef765fcd33f54765242236fd3314e531e7b81fd0..dfa472d514ccd601d75458ee3d7c0492c786ccf1 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-reg.c
+++ b/drivers/i2c/muxes/i2c-mux-reg.c
@@ -247,7 +247,7 @@ MODULE_DEVICE_TABLE(of, i2c_mux_reg_of_match);
 
 static struct platform_driver i2c_mux_reg_driver = {
        .probe  = i2c_mux_reg_probe,
-       .remove_new = i2c_mux_reg_remove,
+       .remove = i2c_mux_reg_remove,
        .driver = {
                .name   = "i2c-mux-reg",
                .of_match_table = of_match_ptr(i2c_mux_reg_of_match),