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 f4dde08..2da7317 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 6f0ef58..d9dd0e4 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 cc5a266..1550d3d 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 dc52b35..edc047e 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 902e420..b78b38d 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 a66f7f6..48916cf 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 133d028..15b632a 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 eb5c46a..340fe13 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 ae42e37..8554e79 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 83b8501..00f1a04 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 ee2f32c..b64026f 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 fdc1758..8065c7e 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 52e3000..26a36a6 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 4794ec0..260e164 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 ab2688b..43bf90d 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 c4fb5e9..71dc0a6 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 b44c5d1..f722ffc 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 3dc5a46..38d7f31 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 11ed055..bde2ef0 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 d08be3f..2512cef 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 d8baca9..e330015 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 e0bd218..f4355b1 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 efafc05..0fc39ca 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 ec1ebac..78c5845 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 64cade6..370f329 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 82dedb1..c76c411 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 e0e8718..02f75cf 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 976d43f..8adf296 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 9853931..c235835 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 859c14e..ce5ca5b 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 92cc5b0..664a547 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 eb66942..212196a 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 9fb33cb..6943a0d 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 c7b203c..e1d6953 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 0b0a1c4..d1543e7 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 b3a7392..21f67f3 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 8223f6d..07d3cad 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 236d6b8..28c5c5c 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 e0ba653..5bd3420 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 23d417f..2103f21 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 29f94ef..8743095 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 36def0a..ad62d56 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 7620bdc..482a007 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 482b37c..0f67e57 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 dc6dff9..edfca7b 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 1d9ad25..92faf03 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 d9dd71c..c9b6289 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 5fbfb9b..a486a37 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 b8d5480..87da824 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 1dafadd..d4d139b 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 b6b0353..9a867c8 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 4d76e71..cb69884 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 99e4305..5cc791b 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 579c016..59f2e05 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 d480162..86ec391 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 9267df3..a7b77d1 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 c7f3a4c..c218f73 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 4ef9bad..d4e9196 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 8380a68..02b76e2 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 7698d9d..0f3cf50 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 d7af8e0..10a5146 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 8a043f5..620f125 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 f86c297..efe2962 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 18516bc..d906060 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 9c45e75..56b2e5c 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 05b19ed..750fff3 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 230fff0..b3d56d0 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 0174ead..973a3a8 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 074eade..fb5280b 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 bbb9062..31f8d08 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 dabadbc..bb0de6d 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 1df5b42..87976e9 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 10a99cd..d877f5a 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 ef57533..b95d50d 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 76abfa7..a1ab6ef 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 3415683..4eb740f 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 2ed4130..503e2f4 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 658396c..663fe56 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 1d68177..c4d3eb0 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 08a59a9..4d5e49b 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 3648382..4d6abd7 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 7aa6e79..d6ef91b 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 7e2686b..dce18f7 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 944577b..9b46b84 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 10d6330..ab8e116 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 3f06aa3..1c2debc 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 02aaf07..fc686a3 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 ef765fc..dfa472d 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),