serial: 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/tty/serial to use .remove(),
with the eventual goal to drop struct platform_driver::remove_new(). As
.remove() and .remove_new() have the same prototypes, conversion is done
by just changing the structure member name in the driver initializer.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241007205803.444994-7-u.kleine-koenig@baylibre.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_aspeed_vuart.c b/drivers/tty/serial/8250/8250_aspeed_vuart.c
index 25c201c..e5da9ce 100644 (file)
--- a/drivers/tty/serial/8250/8250_aspeed_vuart.c
+++ b/drivers/tty/serial/8250/8250_aspeed_vuart.c
@@ -569,7 +569,7 @@ static struct platform_driver aspeed_vuart_driver = {
                .of_match_table = aspeed_vuart_table,
        },
        .probe = aspeed_vuart_probe,
-       .remove_new = aspeed_vuart_remove,
+       .remove = aspeed_vuart_remove,
 };
 
 module_platform_driver(aspeed_vuart_driver);

diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c
index d7a0f27..fdb53b5 100644 (file)
--- a/drivers/tty/serial/8250/8250_bcm2835aux.c
+++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
@@ -267,7 +267,7 @@ static struct platform_driver bcm2835aux_serial_driver = {
                .pm = pm_ptr(&bcm2835aux_dev_pm_ops),
        },
        .probe  = bcm2835aux_serial_probe,
-       .remove_new = bcm2835aux_serial_remove,
+       .remove = bcm2835aux_serial_remove,
 };
 module_platform_driver(bcm2835aux_serial_driver);
 

diff --git a/drivers/tty/serial/8250/8250_bcm7271.c b/drivers/tty/serial/8250/8250_bcm7271.c
index 2569ca6..a713ffc 100644 (file)
--- a/drivers/tty/serial/8250/8250_bcm7271.c
+++ b/drivers/tty/serial/8250/8250_bcm7271.c
@@ -1204,7 +1204,7 @@ static struct platform_driver brcmuart_platform_driver = {
                .of_match_table = brcmuart_dt_ids,
        },
        .probe          = brcmuart_probe,
-       .remove_new     = brcmuart_remove,
+       .remove         = brcmuart_remove,
 };
 
 static int __init brcmuart_init(void)

diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index ab9e7f2..3b278bf 100644 (file)
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -796,7 +796,7 @@ static struct platform_driver dw8250_platform_driver = {
                .acpi_match_table = dw8250_acpi_match,
        },
        .probe                  = dw8250_probe,
-       .remove_new             = dw8250_remove,
+       .remove                 = dw8250_remove,
 };
 
 module_platform_driver(dw8250_platform_driver);

diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c
index a754755..35094f8 100644 (file)
--- a/drivers/tty/serial/8250/8250_em.c
+++ b/drivers/tty/serial/8250/8250_em.c
@@ -219,7 +219,7 @@ static struct platform_driver serial8250_em_platform_driver = {
                .of_match_table = serial8250_em_dt_ids,
        },
        .probe                  = serial8250_em_probe,
-       .remove_new             = serial8250_em_remove,
+       .remove                 = serial8250_em_remove,
 };
 
 module_platform_driver(serial8250_em_platform_driver);

diff --git a/drivers/tty/serial/8250/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c
index b4ed442..1b7bd55 100644 (file)
--- a/drivers/tty/serial/8250/8250_fsl.c
+++ b/drivers/tty/serial/8250/8250_fsl.c
@@ -179,7 +179,7 @@ static struct platform_driver fsl8250_platform_driver = {
                .acpi_match_table       = ACPI_PTR(fsl_8250_acpi_id),
        },
        .probe                  = fsl8250_acpi_probe,
-       .remove_new             = fsl8250_acpi_remove,
+       .remove                 = fsl8250_acpi_remove,
 };
 
 module_platform_driver(fsl8250_platform_driver);

diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c
index a2783e3..a73dd37 100644 (file)
--- a/drivers/tty/serial/8250/8250_ingenic.c
+++ b/drivers/tty/serial/8250/8250_ingenic.c
@@ -361,7 +361,7 @@ static struct platform_driver ingenic_uart_platform_driver = {
                .of_match_table = of_match,
        },
        .probe                  = ingenic_uart_probe,
-       .remove_new             = ingenic_uart_remove,
+       .remove                 = ingenic_uart_remove,
 };
 
 module_platform_driver(ingenic_uart_platform_driver);

diff --git a/drivers/tty/serial/8250/8250_ioc3.c b/drivers/tty/serial/8250/8250_ioc3.c
index 50c77c3..499e80a 100644 (file)
--- a/drivers/tty/serial/8250/8250_ioc3.c
+++ b/drivers/tty/serial/8250/8250_ioc3.c
@@ -84,7 +84,7 @@ static void serial8250_ioc3_remove(struct platform_device *pdev)
 
 static struct platform_driver serial8250_ioc3_driver = {
        .probe  = serial8250_ioc3_probe,
-       .remove_new = serial8250_ioc3_remove,
+       .remove = serial8250_ioc3_remove,
        .driver = {
                .name = "ioc3-serial8250",
        }

diff --git a/drivers/tty/serial/8250/8250_lpc18xx.c b/drivers/tty/serial/8250/8250_lpc18xx.c
index 47e1a05..d524459 100644 (file)
--- a/drivers/tty/serial/8250/8250_lpc18xx.c
+++ b/drivers/tty/serial/8250/8250_lpc18xx.c
@@ -195,7 +195,7 @@ MODULE_DEVICE_TABLE(of, lpc18xx_serial_match);
 
 static struct platform_driver lpc18xx_serial_driver = {
        .probe  = lpc18xx_serial_probe,
-       .remove_new = lpc18xx_serial_remove,
+       .remove = lpc18xx_serial_remove,
        .driver = {
                .name = "lpc18xx-uart",
                .of_match_table = lpc18xx_serial_match,

diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index b9cca21..ed2225b 100644 (file)
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -654,7 +654,7 @@ static struct platform_driver mtk8250_platform_driver = {
                .of_match_table = mtk8250_of_match,
        },
        .probe                  = mtk8250_probe,
-       .remove_new             = mtk8250_remove,
+       .remove                 = mtk8250_remove,
 };
 module_platform_driver(mtk8250_platform_driver);
 

diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index e14f47e..64aed7e 100644 (file)
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -352,7 +352,7 @@ static struct platform_driver of_platform_serial_driver = {
                .pm = &of_serial_pm_ops,
        },
        .probe = of_platform_serial_probe,
-       .remove_new = of_platform_serial_remove,
+       .remove = of_platform_serial_remove,
 };
 
 module_platform_driver(of_platform_serial_driver);

diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index 88b58f4..9b99a50 100644 (file)
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -1867,7 +1867,7 @@ static struct platform_driver omap8250_platform_driver = {
                .of_match_table = omap8250_dt_ids,
        },
        .probe                  = omap8250_probe,
-       .remove_new             = omap8250_remove,
+       .remove                 = omap8250_remove,
 };
 module_platform_driver(omap8250_platform_driver);
 

diff --git a/drivers/tty/serial/8250/8250_platform.c b/drivers/tty/serial/8250/8250_platform.c
index be7ff07..8bdc187 100644 (file)
--- a/drivers/tty/serial/8250/8250_platform.c
+++ b/drivers/tty/serial/8250/8250_platform.c
@@ -285,7 +285,7 @@ MODULE_DEVICE_TABLE(acpi, acpi_platform_serial_table);
 
 static struct platform_driver serial8250_isa_driver = {
        .probe          = serial8250_probe,
-       .remove_new     = serial8250_remove,
+       .remove         = serial8250_remove,
        .suspend        = serial8250_suspend,
        .resume         = serial8250_resume,
        .driver         = {

diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c
index 96dd612..6dd0190 100644 (file)
--- a/drivers/tty/serial/8250/8250_pxa.c
+++ b/drivers/tty/serial/8250/8250_pxa.c
@@ -154,7 +154,7 @@ static void serial_pxa_remove(struct platform_device *pdev)
 
 static struct platform_driver serial_pxa_driver = {
        .probe          = serial_pxa_probe,
-       .remove_new     = serial_pxa_remove,
+       .remove         = serial_pxa_remove,
 
        .driver         = {
                .name   = "pxa2xx-uart",

diff --git a/drivers/tty/serial/8250/8250_tegra.c b/drivers/tty/serial/8250/8250_tegra.c
index 60a80d0..2f3b007 100644 (file)
--- a/drivers/tty/serial/8250/8250_tegra.c
+++ b/drivers/tty/serial/8250/8250_tegra.c
@@ -182,7 +182,7 @@ static struct platform_driver tegra_uart_driver = {
                .acpi_match_table = ACPI_PTR(tegra_uart_acpi_match),
        },
        .probe = tegra_uart_probe,
-       .remove_new = tegra_uart_remove,
+       .remove = tegra_uart_remove,
 };
 
 module_platform_driver(tegra_uart_driver);

diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c
index 670d2ca..4874a96 100644 (file)
--- a/drivers/tty/serial/8250/8250_uniphier.c
+++ b/drivers/tty/serial/8250/8250_uniphier.c
@@ -282,7 +282,7 @@ MODULE_DEVICE_TABLE(of, uniphier_uart_match);
 
 static struct platform_driver uniphier_uart_platform_driver = {
        .probe          = uniphier_uart_probe,
-       .remove_new     = uniphier_uart_remove,
+       .remove         = uniphier_uart_remove,
        .driver = {
                .name   = "uniphier-uart",
                .of_match_table = uniphier_uart_match,

diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index effcba7..6162108 100644 (file)
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -449,7 +449,7 @@ MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
 
 static struct platform_driver altera_jtaguart_platform_driver = {
        .probe  = altera_jtaguart_probe,
-       .remove_new = altera_jtaguart_remove,
+       .remove = altera_jtaguart_remove,
        .driver = {
                .name           = DRV_NAME,
                .of_match_table = of_match_ptr(altera_jtaguart_match),

diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 897f099..8eed254 100644 (file)
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -617,7 +617,7 @@ MODULE_DEVICE_TABLE(of, altera_uart_match);
 
 static struct platform_driver altera_uart_platform_driver = {
        .probe  = altera_uart_probe,
-       .remove_new = altera_uart_remove,
+       .remove = altera_uart_remove,
        .driver = {
                .name           = DRV_NAME,
                .of_match_table = of_match_ptr(altera_uart_match),

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 7d0134e..56e587b 100644 (file)
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2937,7 +2937,7 @@ MODULE_DEVICE_TABLE(acpi, sbsa_uart_acpi_match);
 
 static struct platform_driver arm_sbsa_uart_platform_driver = {
        .probe          = sbsa_uart_probe,
-       .remove_new     = sbsa_uart_remove,
+       .remove         = sbsa_uart_remove,
        .driver = {
                .name   = "sbsa-uart",
                .pm     = &pl011_dev_pm_ops,

diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
index 47889a5..8bb3355 100644 (file)
--- a/drivers/tty/serial/ar933x_uart.c
+++ b/drivers/tty/serial/ar933x_uart.c
@@ -832,7 +832,7 @@ MODULE_DEVICE_TABLE(of, ar933x_uart_of_ids);
 
 static struct platform_driver ar933x_uart_platform_driver = {
        .probe          = ar933x_uart_probe,
-       .remove_new     = ar933x_uart_remove,
+       .remove         = ar933x_uart_remove,
        .driver         = {
                .name           = DRIVER_NAME,
                .of_match_table = of_match_ptr(ar933x_uart_of_ids),

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 09b246c..b9be993 100644 (file)
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -3017,7 +3017,7 @@ static SIMPLE_DEV_PM_OPS(atmel_serial_pm_ops, atmel_serial_suspend,
 
 static struct platform_driver atmel_serial_driver = {
        .probe          = atmel_serial_probe,
-       .remove_new     = atmel_serial_remove,
+       .remove         = atmel_serial_remove,
        .driver         = {
                .name                   = "atmel_usart_serial",
                .of_match_table         = of_match_ptr(atmel_serial_dt_ids),

diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index b88cc28..51df9d2 100644 (file)
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -884,7 +884,7 @@ MODULE_DEVICE_TABLE(of, bcm63xx_of_match);
  */
 static struct platform_driver bcm_uart_platform_driver = {
        .probe  = bcm_uart_probe,
-       .remove_new = bcm_uart_remove,
+       .remove = bcm_uart_remove,
        .driver = {
                .name  = "bcm63xx_uart",
                .of_match_table = bcm63xx_of_match,

diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index 30425a3..83186bf 100644 (file)
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -529,7 +529,7 @@ static struct platform_driver clps711x_uart_platform = {
                .of_match_table = of_match_ptr(clps711x_uart_dt_ids),
        },
        .probe  = uart_clps711x_probe,
-       .remove_new = uart_clps711x_remove,
+       .remove = uart_clps711x_remove,
 };
 
 static int __init uart_clps711x_init(void)

diff --git a/drivers/tty/serial/cpm_uart.c b/drivers/tty/serial/cpm_uart.c
index a927478..550712a 100644 (file)
--- a/drivers/tty/serial/cpm_uart.c
+++ b/drivers/tty/serial/cpm_uart.c
@@ -1573,7 +1573,7 @@ static struct platform_driver cpm_uart_driver = {
                .of_match_table = cpm_uart_match,
        },
        .probe = cpm_uart_probe,
-       .remove_new = cpm_uart_remove,
+       .remove = cpm_uart_remove,
  };
 
 static int __init cpm_uart_init(void)

diff --git a/drivers/tty/serial/digicolor-usart.c b/drivers/tty/serial/digicolor-usart.c
index 2ccd13c..d2482df 100644 (file)
--- a/drivers/tty/serial/digicolor-usart.c
+++ b/drivers/tty/serial/digicolor-usart.c
@@ -522,7 +522,7 @@ static struct platform_driver digicolor_uart_platform = {
                .of_match_table = of_match_ptr(digicolor_uart_dt_ids),
        },
        .probe  = digicolor_uart_probe,
-       .remove_new = digicolor_uart_remove,
+       .remove = digicolor_uart_remove,
 };
 
 static int __init digicolor_uart_init(void)

diff --git a/drivers/tty/serial/esp32_acm.c b/drivers/tty/serial/esp32_acm.c
index 85eb039..bb7cc65 100644 (file)
--- a/drivers/tty/serial/esp32_acm.c
+++ b/drivers/tty/serial/esp32_acm.c
@@ -423,7 +423,7 @@ static void esp32s3_acm_remove(struct platform_device *pdev)
 
 static struct platform_driver esp32s3_acm_driver = {
        .probe          = esp32s3_acm_probe,
-       .remove_new     = esp32s3_acm_remove,
+       .remove         = esp32s3_acm_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .of_match_table = esp32s3_acm_dt_ids,

diff --git a/drivers/tty/serial/esp32_uart.c b/drivers/tty/serial/esp32_uart.c
index 8c86cf9..667c219 100644 (file)
--- a/drivers/tty/serial/esp32_uart.c
+++ b/drivers/tty/serial/esp32_uart.c
@@ -743,7 +743,7 @@ static void esp32_uart_remove(struct platform_device *pdev)
 
 static struct platform_driver esp32_uart_driver = {
        .probe          = esp32_uart_probe,
-       .remove_new     = esp32_uart_remove,
+       .remove         = esp32_uart_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .of_match_table = esp32_uart_dt_ids,

diff --git a/drivers/tty/serial/fsl_linflexuart.c b/drivers/tty/serial/fsl_linflexuart.c
index e972df4..e70a56d 100644 (file)
--- a/drivers/tty/serial/fsl_linflexuart.c
+++ b/drivers/tty/serial/fsl_linflexuart.c
@@ -882,7 +882,7 @@ static SIMPLE_DEV_PM_OPS(linflex_pm_ops, linflex_suspend, linflex_resume);
 
 static struct platform_driver linflex_driver = {
        .probe          = linflex_probe,
-       .remove_new     = linflex_remove,
+       .remove         = linflex_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .of_match_table = linflex_dt_ids,

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 77efa7e..c14a83c 100644 (file)
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -3206,7 +3206,7 @@ static const struct dev_pm_ops lpuart_pm_ops = {
 
 static struct platform_driver lpuart_driver = {
        .probe          = lpuart_probe,
-       .remove_new     = lpuart_remove,
+       .remove         = lpuart_remove,
        .driver         = {
                .name   = "fsl-lpuart",
                .of_match_table = lpuart_dt_ids,

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 67d4a72..f736796 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -2702,7 +2702,7 @@ static const struct dev_pm_ops imx_uart_pm_ops = {
 
 static struct platform_driver imx_uart_platform_driver = {
        .probe = imx_uart_probe,
-       .remove_new = imx_uart_remove,
+       .remove = imx_uart_remove,
 
        .driver = {
                .name = "imx-uart",

diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index a073177..58a3ab0 100644 (file)
--- a/drivers/tty/serial/lantiq.c
+++ b/drivers/tty/serial/lantiq.c
@@ -915,7 +915,7 @@ MODULE_DEVICE_TABLE(of, ltq_asc_match);
 
 static struct platform_driver lqasc_driver = {
        .probe          = lqasc_probe,
-       .remove_new     = lqasc_remove,
+       .remove         = lqasc_remove,
        .driver         = {
                .name   = DRVNAME,
                .of_match_table = ltq_asc_match,

diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c
index 3ce369f..6c13cf1 100644 (file)
--- a/drivers/tty/serial/liteuart.c
+++ b/drivers/tty/serial/liteuart.c
@@ -353,7 +353,7 @@ MODULE_DEVICE_TABLE(of, liteuart_of_match);
 
 static struct platform_driver liteuart_platform_driver = {
        .probe = liteuart_probe,
-       .remove_new = liteuart_remove,
+       .remove = liteuart_remove,
        .driver = {
                .name = KBUILD_MODNAME,
                .of_match_table = liteuart_of_match,

diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index 3e4ac46..42c5f9b 100644 (file)
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ b/drivers/tty/serial/lpc32xx_hs.c
@@ -695,7 +695,7 @@ MODULE_DEVICE_TABLE(of, serial_hs_lpc32xx_dt_ids);
 
 static struct platform_driver serial_hs_lpc32xx_driver = {
        .probe          = serial_hs_lpc32xx_probe,
-       .remove_new     = serial_hs_lpc32xx_remove,
+       .remove         = serial_hs_lpc32xx_remove,
        .suspend        = serial_hs_lpc32xx_suspend,
        .resume         = serial_hs_lpc32xx_resume,
        .driver         = {

diff --git a/drivers/tty/serial/ma35d1_serial.c b/drivers/tty/serial/ma35d1_serial.c
index 3b4206e..8dcad52 100644 (file)
--- a/drivers/tty/serial/ma35d1_serial.c
+++ b/drivers/tty/serial/ma35d1_serial.c
@@ -794,7 +794,7 @@ static int ma35d1serial_resume(struct platform_device *dev)
 
 static struct platform_driver ma35d1serial_driver = {
        .probe      = ma35d1serial_probe,
-       .remove_new = ma35d1serial_remove,
+       .remove     = ma35d1serial_remove,
        .suspend    = ma35d1serial_suspend,
        .resume     = ma35d1serial_resume,
        .driver     = {

diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index 58858dd..93e7dda 100644 (file)
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -616,7 +616,7 @@ static void mcf_remove(struct platform_device *pdev)
 
 static struct platform_driver mcf_platform_driver = {
        .probe          = mcf_probe,
-       .remove_new     = mcf_remove,
+       .remove         = mcf_remove,
        .driver         = {
                .name   = "mcfuart",
        },

diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index 8eb586a..a6cb2a5 100644 (file)
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -842,7 +842,7 @@ MODULE_DEVICE_TABLE(of, meson_uart_dt_match);
 
 static  struct platform_driver meson_uart_platform_driver = {
        .probe          = meson_uart_probe,
-       .remove_new     = meson_uart_remove,
+       .remove         = meson_uart_remove,
        .driver         = {
                .name           = "meson_uart",
                .of_match_table = meson_uart_dt_match,

diff --git a/drivers/tty/serial/milbeaut_usio.c b/drivers/tty/serial/milbeaut_usio.c
index fb082ee..059bea1 100644 (file)
--- a/drivers/tty/serial/milbeaut_usio.c
+++ b/drivers/tty/serial/milbeaut_usio.c
@@ -570,7 +570,7 @@ MODULE_DEVICE_TABLE(of, mlb_usio_dt_ids);
 
 static struct platform_driver mlb_usio_driver = {
        .probe          = mlb_usio_probe,
-       .remove_new     = mlb_usio_remove,
+       .remove         = mlb_usio_remove,
        .driver         = {
                .name   = USIO_NAME,
                .of_match_table = mlb_usio_dt_ids,

diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 95dae5e..f55aa35 100644 (file)
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -1843,7 +1843,7 @@ MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match);
 
 static struct platform_driver mpc52xx_uart_of_driver = {
        .probe          = mpc52xx_uart_of_probe,
-       .remove_new     = mpc52xx_uart_of_remove,
+       .remove         = mpc52xx_uart_of_remove,
 #ifdef CONFIG_PM
        .suspend        = mpc52xx_uart_of_suspend,
        .resume         = mpc52xx_uart_of_resume,

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 0a9c521..1b137e0 100644 (file)
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -1894,7 +1894,7 @@ static const struct dev_pm_ops msm_serial_dev_pm_ops = {
 };
 
 static struct platform_driver msm_platform_driver = {
-       .remove_new = msm_serial_remove,
+       .remove = msm_serial_remove,
        .probe = msm_serial_probe,
        .driver = {
                .name = "msm_serial",

diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index a1c7656..cc65c9f 100644 (file)
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -1704,7 +1704,7 @@ static void mxs_auart_remove(struct platform_device *pdev)
 
 static struct platform_driver mxs_auart_driver = {
        .probe = mxs_auart_probe,
-       .remove_new = mxs_auart_remove,
+       .remove = mxs_auart_remove,
        .driver = {
                .name = "mxs-auart",
                .of_match_table = mxs_auart_dt_ids,

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index d7e172e..0b85f47 100644 (file)
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1802,7 +1802,7 @@ MODULE_DEVICE_TABLE(of, omap_serial_of_match);
 
 static struct platform_driver serial_omap_driver = {
        .probe          = serial_omap_probe,
-       .remove_new     = serial_omap_remove,
+       .remove         = serial_omap_remove,
        .driver         = {
                .name   = OMAP_SERIAL_DRIVER_NAME,
                .pm     = &serial_omap_dev_pm_ops,

diff --git a/drivers/tty/serial/owl-uart.c b/drivers/tty/serial/owl-uart.c
index ecec483..0542882 100644 (file)
--- a/drivers/tty/serial/owl-uart.c
+++ b/drivers/tty/serial/owl-uart.c
@@ -730,7 +730,7 @@ static void owl_uart_remove(struct platform_device *pdev)
 
 static struct platform_driver owl_uart_platform_driver = {
        .probe = owl_uart_probe,
-       .remove_new = owl_uart_remove,
+       .remove = owl_uart_remove,
        .driver = {
                .name = "owl-uart",
                .of_match_table = owl_uart_dt_matches,

diff --git a/drivers/tty/serial/pic32_uart.c b/drivers/tty/serial/pic32_uart.c
index 261c811..14d50bd 100644 (file)
--- a/drivers/tty/serial/pic32_uart.c
+++ b/drivers/tty/serial/pic32_uart.c
@@ -956,7 +956,7 @@ MODULE_DEVICE_TABLE(of, pic32_serial_dt_ids);
 
 static struct platform_driver pic32_uart_platform_driver = {
        .probe          = pic32_uart_probe,
-       .remove_new     = pic32_uart_remove,
+       .remove         = pic32_uart_remove,
        .driver         = {
                .name   = PIC32_DEV_NAME,
                .of_match_table = of_match_ptr(pic32_serial_dt_ids),

diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 8969b11..e3a9193 100644 (file)
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1776,7 +1776,7 @@ static struct macio_driver pmz_driver = {
 
 static struct platform_driver pmz_driver = {
        .probe          = pmz_attach,
-       .remove_new     = pmz_detach,
+       .remove         = pmz_detach,
        .driver         = {
                .name           = "scc",
        },

diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 6f0db31..a433a3c 100644 (file)
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -1846,7 +1846,7 @@ static const struct of_device_id qcom_geni_serial_match_table[] = {
 MODULE_DEVICE_TABLE(of, qcom_geni_serial_match_table);
 
 static struct platform_driver qcom_geni_serial_platform_driver = {
-       .remove_new = qcom_geni_serial_remove,
+       .remove = qcom_geni_serial_remove,
        .probe = qcom_geni_serial_probe,
        .driver = {
                .name = "qcom_geni_serial",

diff --git a/drivers/tty/serial/rda-uart.c b/drivers/tty/serial/rda-uart.c
index 663e35e..87fa30d 100644 (file)
--- a/drivers/tty/serial/rda-uart.c
+++ b/drivers/tty/serial/rda-uart.c
@@ -777,7 +777,7 @@ static void rda_uart_remove(struct platform_device *pdev)
 
 static struct platform_driver rda_uart_platform_driver = {
        .probe = rda_uart_probe,
-       .remove_new = rda_uart_remove,
+       .remove = rda_uart_remove,
        .driver = {
                .name = "rda-uart",
                .of_match_table = rda_uart_dt_matches,

diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index 79c794f..3c34027 100644 (file)
--- a/drivers/tty/serial/sa1100.c
+++ b/drivers/tty/serial/sa1100.c
@@ -880,7 +880,7 @@ static void sa1100_serial_remove(struct platform_device *pdev)
 
 static struct platform_driver sa11x0_serial_driver = {
        .probe          = sa1100_serial_probe,
-       .remove_new     = sa1100_serial_remove,
+       .remove         = sa1100_serial_remove,
        .suspend        = sa1100_serial_suspend,
        .resume         = sa1100_serial_resume,
        .driver         = {

diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c
index 0d184ee..405b1a2 100644 (file)
--- a/drivers/tty/serial/samsung_tty.c
+++ b/drivers/tty/serial/samsung_tty.c
@@ -2653,7 +2653,7 @@ MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);
 
 static struct platform_driver samsung_serial_driver = {
        .probe          = s3c24xx_serial_probe,
-       .remove_new     = s3c24xx_serial_remove,
+       .remove         = s3c24xx_serial_remove,
        .id_table       = s3c24xx_serial_driver_ids,
        .driver         = {
                .name   = "samsung-uart",

diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index 6d1d142..4c851da 100644 (file)
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -1052,7 +1052,7 @@ static struct platform_driver sccnxp_uart_driver = {
                .name   = SCCNXP_NAME,
        },
        .probe          = sccnxp_probe,
-       .remove_new     = sccnxp_remove,
+       .remove         = sccnxp_remove,
        .id_table       = sccnxp_id_table,
 };
 module_platform_driver(sccnxp_uart_driver);

diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index 1183ca5..8004fc0 100644 (file)
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c
@@ -1648,7 +1648,7 @@ static const struct dev_pm_ops tegra_uart_pm_ops = {
 
 static struct platform_driver tegra_uart_platform_driver = {
        .probe          = tegra_uart_probe,
-       .remove_new     = tegra_uart_remove,
+       .remove         = tegra_uart_remove,
        .driver         = {
                .name   = "serial-tegra",
                .of_match_table = tegra_uart_of_match,

diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index abba397..436a559 100644 (file)
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -1097,7 +1097,7 @@ static int serial_txx9_resume(struct platform_device *dev)
 
 static struct platform_driver serial_txx9_plat_driver = {
        .probe          = serial_txx9_probe,
-       .remove_new     = serial_txx9_remove,
+       .remove         = serial_txx9_remove,
 #ifdef CONFIG_PM
        .suspend        = serial_txx9_suspend,
        .resume         = serial_txx9_resume,

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index b80e9a5..df523c7 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -3505,7 +3505,7 @@ static SIMPLE_DEV_PM_OPS(sci_dev_pm_ops, sci_suspend, sci_resume);
 
 static struct platform_driver sci_driver = {
        .probe          = sci_probe,
-       .remove_new     = sci_remove,
+       .remove         = sci_remove,
        .driver         = {
                .name   = "sh-sci",
                .pm     = &sci_dev_pm_ops,

diff --git a/drivers/tty/serial/sifive.c b/drivers/tty/serial/sifive.c
index cbfce65..5904a2d 100644 (file)
--- a/drivers/tty/serial/sifive.c
+++ b/drivers/tty/serial/sifive.c
@@ -1040,7 +1040,7 @@ MODULE_DEVICE_TABLE(of, sifive_serial_of_match);
 
 static struct platform_driver sifive_serial_platform_driver = {
        .probe          = sifive_serial_probe,
-       .remove_new     = sifive_serial_remove,
+       .remove         = sifive_serial_remove,
        .driver         = {
                .name   = SIFIVE_SERIAL_NAME,
                .pm = pm_sleep_ptr(&sifive_uart_pm_ops),

diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c
index 3fc54cc..397a284 100644 (file)
--- a/drivers/tty/serial/sprd_serial.c
+++ b/drivers/tty/serial/sprd_serial.c
@@ -1255,7 +1255,7 @@ MODULE_DEVICE_TABLE(of, serial_ids);
 
 static struct platform_driver sprd_platform_driver = {
        .probe          = sprd_probe,
-       .remove_new     = sprd_remove,
+       .remove         = sprd_remove,
        .driver         = {
                .name   = "sprd_serial",
                .of_match_table = serial_ids,

diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index 8aea59f..6ed9a32 100644 (file)
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -934,7 +934,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(asc_serial_pm_ops, asc_serial_suspend,
 
 static struct platform_driver asc_serial_driver = {
        .probe          = asc_serial_probe,
-       .remove_new     = asc_serial_remove,
+       .remove         = asc_serial_remove,
        .driver = {
                .name   = DRIVER_NAME,
                .pm     = pm_sleep_ptr(&asc_serial_pm_ops),

diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index e1e7bc0..7dc2545 100644 (file)
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -2188,7 +2188,7 @@ static const struct dev_pm_ops stm32_serial_pm_ops = {
 
 static struct platform_driver stm32_serial_driver = {
        .probe          = stm32_usart_serial_probe,
-       .remove_new     = stm32_usart_serial_remove,
+       .remove         = stm32_usart_serial_remove,
        .driver = {
                .name   = DRIVER_NAME,
                .pm     = &stm32_serial_pm_ops,

diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index 7f60679..2b3ec65 100644 (file)
--- a/drivers/tty/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
@@ -633,7 +633,7 @@ static struct platform_driver hv_driver = {
                .of_match_table = hv_match,
        },
        .probe          = hv_probe,
-       .remove_new     = hv_remove,
+       .remove         = hv_remove,
 };
 
 static int __init sunhv_init(void)

diff --git a/drivers/tty/serial/sunplus-uart.c b/drivers/tty/serial/sunplus-uart.c
index abf7c44..38deee5 100644 (file)
--- a/drivers/tty/serial/sunplus-uart.c
+++ b/drivers/tty/serial/sunplus-uart.c
@@ -697,7 +697,7 @@ MODULE_DEVICE_TABLE(of, sp_uart_of_match);
 
 static struct platform_driver sunplus_uart_platform_driver = {
        .probe          = sunplus_uart_probe,
-       .remove_new     = sunplus_uart_remove,
+       .remove         = sunplus_uart_remove,
        .driver = {
                .name   = "sunplus_uart",
                .of_match_table = sp_uart_of_match,

diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index 1acbe2f..df906cc 100644 (file)
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -1100,7 +1100,7 @@ static struct platform_driver sab_driver = {
                .of_match_table = sab_match,
        },
        .probe          = sab_probe,
-       .remove_new     = sab_remove,
+       .remove         = sab_remove,
 };
 
 static int __init sunsab_init(void)

diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 0f463da..7f0fef0 100644 (file)
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -1549,7 +1549,7 @@ static struct platform_driver su_driver = {
                .of_match_table = su_match,
        },
        .probe          = su_probe,
-       .remove_new     = su_remove,
+       .remove         = su_remove,
 };
 
 static int __init sunsu_init(void)

diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 71758ad..0551c24 100644 (file)
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -1538,7 +1538,7 @@ static struct platform_driver zs_driver = {
                .of_match_table = zs_match,
        },
        .probe          = zs_probe,
-       .remove_new     = zs_remove,
+       .remove         = zs_remove,
 };
 
 static int __init sunzilog_init(void)

diff --git a/drivers/tty/serial/tegra-tcu.c b/drivers/tty/serial/tegra-tcu.c
index 21ca5fc..7033dbf 100644 (file)
--- a/drivers/tty/serial/tegra-tcu.c
+++ b/drivers/tty/serial/tegra-tcu.c
@@ -293,7 +293,7 @@ static struct platform_driver tegra_tcu_driver = {
                .of_match_table = tegra_tcu_match,
        },
        .probe = tegra_tcu_probe,
-       .remove_new = tegra_tcu_remove,
+       .remove = tegra_tcu_remove,
 };
 module_platform_driver(tegra_tcu_driver);
 

diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index 43fa093..6fa93c3 100644 (file)
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -485,7 +485,7 @@ static struct platform_driver timbuart_platform_driver = {
                .name   = "timb-uart",
        },
        .probe          = timbuart_probe,
-       .remove_new     = timbuart_remove,
+       .remove         = timbuart_remove,
 };
 
 module_platform_driver(timbuart_platform_driver);

diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 68357ac..a41e7fc 100644 (file)
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -915,7 +915,7 @@ MODULE_ALIAS("platform:uartlite");
 
 static struct platform_driver ulite_platform_driver = {
        .probe = ulite_probe,
-       .remove_new = ulite_remove,
+       .remove = ulite_remove,
        .driver = {
                .name  = "uartlite",
                .of_match_table = of_match_ptr(ulite_of_match),

diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 53bb8c5..6e27843 100644 (file)
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -1484,7 +1484,7 @@ static struct platform_driver ucc_uart_of_driver = {
                .of_match_table    = ucc_uart_match,
        },
        .probe          = ucc_uart_probe,
-       .remove_new     = ucc_uart_remove,
+       .remove         = ucc_uart_remove,
 };
 
 static int __init ucc_uart_init(void)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 7773929..beb151b 100644 (file)
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1903,7 +1903,7 @@ static void cdns_uart_remove(struct platform_device *pdev)
 
 static struct platform_driver cdns_uart_platform_driver = {
        .probe   = cdns_uart_probe,
-       .remove_new = cdns_uart_remove,
+       .remove  = cdns_uart_remove,
        .driver  = {
                .name = CDNS_UART_NAME,
                .of_match_table = cdns_uart_of_match,