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

While touching these files, make indention of the struct initializer
consistent in several files.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20241010203622.839625-4-u.kleine-koenig@baylibre.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 08ca18e91124dd3c7c75598795ddf4fea08ab5b0..052f65c48a703e32426a7e8dadd588151a624df6 100644 (file)
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -285,7 +285,7 @@ static void acq_shutdown(struct platform_device *dev)
 }
 
 static struct platform_driver acquirewdt_driver = {
-       .remove_new     = acq_remove,
+       .remove         = acq_remove,
        .shutdown       = acq_shutdown,
        .driver         = {
                .name   = DRV_NAME,

diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index e41cd3ba4e0e95f0212e3248ce75140bf5a73875..42d3f377178109a767037fac61b658c129bcd0cc 100644 (file)
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -293,7 +293,7 @@ static void advwdt_shutdown(struct platform_device *dev)
 }
 
 static struct platform_driver advwdt_driver = {
-       .remove_new     = advwdt_remove,
+       .remove         = advwdt_remove,
        .shutdown       = advwdt_shutdown,
        .driver         = {
                .name   = DRV_NAME,

diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 17382512a6096f82c99360021852f4e0db0bca9e..1795aaf1ec45e340f81619e3970de5383cbe6f06 100644 (file)
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -295,7 +295,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
 
 static struct platform_driver at91wdt_driver = {
        .probe          = at91wdt_probe,
-       .remove_new     = at91wdt_remove,
+       .remove         = at91wdt_remove,
        .shutdown       = at91wdt_shutdown,
        .suspend        = pm_ptr(at91wdt_suspend),
        .resume         = pm_ptr(at91wdt_resume),

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 2c6474cb858b742c4b31db6a16612da032a8183c..7be70b98d0912eb951d81a7ecc9b5875d8548f2e 100644 (file)
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -392,7 +392,7 @@ MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
 
 static struct platform_driver at91wdt_driver = {
        .probe          = at91wdt_probe,
-       .remove_new     = at91wdt_remove,
+       .remove         = at91wdt_remove,
        .driver         = {
                .name   = "at91_wdt",
                .of_match_table = of_match_ptr(at91_wdt_dt_ids),

diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index d16b2c583fa4079680fbcfebaf8aa82978c9cf78..7df703e9852a6ea14fafb51078f66b6a33a9801e 100644 (file)
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -305,7 +305,7 @@ MODULE_DEVICE_TABLE(of, ath79_wdt_match);
 
 static struct platform_driver ath79_wdt_driver = {
        .probe          = ath79_wdt_probe,
-       .remove_new     = ath79_wdt_remove,
+       .remove         = ath79_wdt_remove,
        .shutdown       = ath79_wdt_shutdown,
        .driver         = {
                .name   = DRIVER_NAME,

diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index bb001c5d7f17fd635b1a084f4a24d4c9ab01ba59..9fcfee63905b9b72c69ad9d4d597d0826f2ccfc9 100644 (file)
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -227,7 +227,7 @@ static void bcm2835_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver bcm2835_wdt_driver = {
        .probe          = bcm2835_wdt_probe,
-       .remove_new     = bcm2835_wdt_remove,
+       .remove         = bcm2835_wdt_remove,
        .driver = {
                .name =         "bcm2835-wdt",
        },

diff --git a/drivers/watchdog/bcm_kona_wdt.c b/drivers/watchdog/bcm_kona_wdt.c
index 49e12d47b073da3077f65e8b4ac6836eadc5a669..66bd0324fd68dbea2036dad3d409de1cea7c2cb4 100644 (file)
--- a/drivers/watchdog/bcm_kona_wdt.c
+++ b/drivers/watchdog/bcm_kona_wdt.c
@@ -328,7 +328,7 @@ static struct platform_driver bcm_kona_wdt_driver = {
                        .of_match_table = bcm_kona_wdt_of_match,
                  },
        .probe = bcm_kona_wdt_probe,
-       .remove_new = bcm_kona_wdt_remove,
+       .remove = bcm_kona_wdt_remove,
 };
 
 module_platform_driver(bcm_kona_wdt_driver);

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 8ee81f018dda09f52597fc77b678a6a5b18f45c3..4fb92c9e046af440603f8bda427bc8e4a23527ae 100644 (file)
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -653,7 +653,7 @@ static struct platform_driver cpwd_driver = {
                .of_match_table = cpwd_match,
        },
        .probe          = cpwd_probe,
-       .remove_new     = cpwd_remove,
+       .remove         = cpwd_remove,
 };
 
 module_platform_driver(cpwd_driver);

diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 84dca3695f862dc2a2c26717c8cbb27cad7db80e..26efca9ae0e7d2fea1b2eaf68085a70829b62b3a 100644 (file)
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -684,7 +684,7 @@ MODULE_DEVICE_TABLE(of, dw_wdt_of_match);
 
 static struct platform_driver dw_wdt_driver = {
        .probe          = dw_wdt_drv_probe,
-       .remove_new     = dw_wdt_drv_remove,
+       .remove         = dw_wdt_drv_remove,
        .driver         = {
                .name   = "dw_wdt",
                .of_match_table = of_match_ptr(dw_wdt_of_match),

diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index d854fcfbfa5bce7715e6a8bd24049b0a82707acd..bf6f733dfb5f7b3ab846a35a5b645ee11ffefc02 100644 (file)
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -305,7 +305,7 @@ static struct platform_driver gef_wdt_driver = {
                .of_match_table = gef_wdt_ids,
        },
        .probe          = gef_wdt_probe,
-       .remove_new     = gef_wdt_remove,
+       .remove         = gef_wdt_remove,
 };
 
 static int __init gef_wdt_init(void)

diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index 4ed6d139320b98d0cd12429f9929716ef9b2da4e..5b80ade1c6814ae5d48bda31911c71ed7859ee1d 100644 (file)
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -248,7 +248,7 @@ static void geodewdt_shutdown(struct platform_device *dev)
 }
 
 static struct platform_driver geodewdt_driver = {
-       .remove_new     = geodewdt_remove,
+       .remove         = geodewdt_remove,
        .shutdown       = geodewdt_shutdown,
        .driver         = {
                .name   = DRV_NAME,

diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index b041ad90a62c53c413c9317f80bf13603a4316b7..5ce6101d236d7a0426d28825fb4493a087576805 100644 (file)
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -331,7 +331,7 @@ static void ibwdt_shutdown(struct platform_device *dev)
 }
 
 static struct platform_driver ibwdt_driver = {
-       .remove_new     = ibwdt_remove,
+       .remove         = ibwdt_remove,
        .shutdown       = ibwdt_shutdown,
        .driver         = {
                .name   = DRV_NAME,

diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c
index e5cbb409df252aa8cad4debfa11f17ba6eedf4ed..5a7bb7e84653f5203b9defc4b42ca19037498e93 100644 (file)
--- a/drivers/watchdog/ie6xx_wdt.c
+++ b/drivers/watchdog/ie6xx_wdt.c
@@ -280,7 +280,7 @@ static void ie6xx_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver ie6xx_wdt_driver = {
        .probe          = ie6xx_wdt_probe,
-       .remove_new     = ie6xx_wdt_remove,
+       .remove         = ie6xx_wdt_remove,
        .driver         = {
                .name   = DRIVER_NAME,
        },

diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c
index 19535f4a2fd2e5d2b4ae56280d7da89fa7234760..f19580e1b3182784e039ab1849d32926fe2e9e86 100644 (file)
--- a/drivers/watchdog/lpc18xx_wdt.c
+++ b/drivers/watchdog/lpc18xx_wdt.c
@@ -281,7 +281,7 @@ static struct platform_driver lpc18xx_wdt_driver = {
                .of_match_table = lpc18xx_wdt_match,
        },
        .probe = lpc18xx_wdt_probe,
-       .remove_new = lpc18xx_wdt_remove,
+       .remove = lpc18xx_wdt_remove,
 };
 module_platform_driver(lpc18xx_wdt_driver);
 

diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 11f05024a1812d23d77f151236bb1358ff9b4088..f75426cfa425294d12c768cdc37c80917ec917de 100644 (file)
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -233,7 +233,7 @@ static void mtx1_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver mtx1_wdt_driver = {
        .probe = mtx1_wdt_probe,
-       .remove_new = mtx1_wdt_remove,
+       .remove = mtx1_wdt_remove,
        .driver.name = "mtx1-wdt",
 };
 

diff --git a/drivers/watchdog/nic7018_wdt.c b/drivers/watchdog/nic7018_wdt.c
index c3f0a4926667e5be678d6b49bf1f6eaaf37078fb..44982b37ba6f56e9385cb70654d7726b663891d1 100644 (file)
--- a/drivers/watchdog/nic7018_wdt.c
+++ b/drivers/watchdog/nic7018_wdt.c
@@ -236,7 +236,7 @@ MODULE_DEVICE_TABLE(acpi, nic7018_device_ids);
 
 static struct platform_driver watchdog_driver = {
        .probe = nic7018_probe,
-       .remove_new = nic7018_remove,
+       .remove = nic7018_remove,
        .driver = {
                .name = KBUILD_MODNAME,
                .acpi_match_table = ACPI_PTR(nic7018_device_ids),

diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index f8eb1f65a59e69f380d7b017f7595790fc80dc84..f16cee5173d5046171a5d044ea864046f139eb09 100644 (file)
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -466,7 +466,7 @@ static void nv_tco_shutdown(struct platform_device *dev)
 
 static struct platform_driver nv_tco_driver = {
        .probe          = nv_tco_init,
-       .remove_new     = nv_tco_remove,
+       .remove         = nv_tco_remove,
        .shutdown       = nv_tco_shutdown,
        .driver         = {
                .name   = TCO_MODULE_NAME,

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index b6e0236509bbd668b9c57d25445f65b593c7a7f1..d523428a8d22035898a9fadc656a4ea2a65b8bd7 100644 (file)
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -357,7 +357,7 @@ MODULE_DEVICE_TABLE(of, omap_wdt_of_match);
 
 static struct platform_driver omap_wdt_driver = {
        .probe          = omap_wdt_probe,
-       .remove_new     = omap_wdt_remove,
+       .remove         = omap_wdt_remove,
        .shutdown       = omap_wdt_shutdown,
        .suspend        = pm_ptr(omap_wdt_suspend),
        .resume         = pm_ptr(omap_wdt_resume),

diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 1fe583e8a95b2ec2d7bcab9ccc9448b6a9e8e606..0e145f762f6f237dd85bbfde0ff3a045a6e90bc0 100644 (file)
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -665,7 +665,7 @@ static void orion_wdt_shutdown(struct platform_device *pdev)
 
 static struct platform_driver orion_wdt_driver = {
        .probe          = orion_wdt_probe,
-       .remove_new     = orion_wdt_remove,
+       .remove         = orion_wdt_remove,
        .shutdown       = orion_wdt_shutdown,
        .driver         = {
                .name   = "orion_wdt",

diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index efadbb9d7ce7865f3c261fce9f053b660194153c..0e5c5c96af58d26d66b49cfa31b3f390a21faa2e 100644 (file)
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -309,7 +309,7 @@ static void rc32434_wdt_shutdown(struct platform_device *pdev)
 
 static struct platform_driver rc32434_wdt_driver = {
        .probe          = rc32434_wdt_probe,
-       .remove_new     = rc32434_wdt_remove,
+       .remove         = rc32434_wdt_remove,
        .shutdown       = rc32434_wdt_shutdown,
        .driver         = {
                        .name = "rc32434_wdt",

diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 80490316a27f82fb6e3741243b0ebc25382f62cb..8955177072fa44c3a0caec6ec92ec57661b599d0 100644 (file)
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -268,7 +268,7 @@ static void rdc321x_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver rdc321x_wdt_driver = {
        .probe = rdc321x_wdt_probe,
-       .remove_new = rdc321x_wdt_remove,
+       .remove = rdc321x_wdt_remove,
        .driver = {
                .name = "rdc321x-wdt",
        },

diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c
index 12c41d6e5cd6f53ee7bc5ef35ac67df741b45468..c0b2a9c5250dd721b6b3336d29b020770cd4dbf5 100644 (file)
--- a/drivers/watchdog/renesas_wdt.c
+++ b/drivers/watchdog/renesas_wdt.c
@@ -337,7 +337,7 @@ static struct platform_driver rwdt_driver = {
                .pm = &rwdt_pm_ops,
        },
        .probe = rwdt_probe,
-       .remove_new = rwdt_remove,
+       .remove = rwdt_remove,
 };
 module_platform_driver(rwdt_driver);
 

diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index f47d90d01c199808abec3a2f14e292b79e8e6e6a..83806ccf06d1a7f571233dfce058c0fa2572e32c 100644 (file)
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -238,7 +238,7 @@ static struct platform_driver riowd_driver = {
                .of_match_table = riowd_match,
        },
        .probe          = riowd_probe,
-       .remove_new     = riowd_remove,
+       .remove         = riowd_remove,
 };
 
 module_platform_driver(riowd_driver);

diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
index e319fa0787c27a116e28de09b6a88bf15b6a8fe2..f410b6e39fb6f61228e1e5342bb8aa1bb3b11747 100644 (file)
--- a/drivers/watchdog/rti_wdt.c
+++ b/drivers/watchdog/rti_wdt.c
@@ -378,7 +378,7 @@ static struct platform_driver rti_wdt_driver = {
                .of_match_table = rti_wdt_of_match,
        },
        .probe = rti_wdt_probe,
-       .remove_new = rti_wdt_remove,
+       .remove = rti_wdt_remove,
 };
 
 module_platform_driver(rti_wdt_driver);

diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 6e91ee3fbfb5fabc9f1ceadc4f2ecd19c0cef9f4..729a8508b31d28519bf77766d199a92b792977a4 100644 (file)
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -236,8 +236,8 @@ static void sa1100dog_remove(struct platform_device *pdev)
 
 static struct platform_driver sa1100dog_driver = {
        .driver.name = "sa1100_wdt",
-       .probe    = sa1100dog_probe,
-       .remove_new       = sa1100dog_remove,
+       .probe = sa1100dog_probe,
+       .remove = sa1100dog_remove,
 };
 module_platform_driver(sa1100dog_driver);
 

diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
index 76053158d259e9b70cacd9cfb7871502a881199d..9670a1ea57cbd9c54807fd72b8a2657e21b6008d 100644 (file)
--- a/drivers/watchdog/sch311x_wdt.c
+++ b/drivers/watchdog/sch311x_wdt.c
@@ -445,7 +445,7 @@ static void sch311x_wdt_shutdown(struct platform_device *dev)
 
 static struct platform_driver sch311x_wdt_driver = {
        .probe          = sch311x_wdt_probe,
-       .remove_new     = sch311x_wdt_remove,
+       .remove         = sch311x_wdt_remove,
        .shutdown       = sch311x_wdt_shutdown,
        .driver         = {
                .name = DRV_NAME,

diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index 10f1fba78ec2d77036ff5ff0a14e5604dc61e49d..7f0150c39421628d6ffc882590e1767d1f97c7a9 100644 (file)
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -297,7 +297,7 @@ static struct platform_driver sh_wdt_driver = {
        },
 
        .probe          = sh_wdt_probe,
-       .remove_new     = sh_wdt_remove,
+       .remove         = sh_wdt_remove,
        .shutdown       = sh_wdt_shutdown,
 };
 

diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
index 4c5b8d98a4f30e5b4c2eecba06946238be7dabb6..d206452072ae2e8fbf7133e69d56f9fff538bec8 100644 (file)
--- a/drivers/watchdog/st_lpc_wdt.c
+++ b/drivers/watchdog/st_lpc_wdt.c
@@ -286,7 +286,7 @@ static struct platform_driver st_wdog_driver = {
                .of_match_table = st_wdog_match,
        },
        .probe = st_wdog_probe,
-       .remove_new = st_wdog_remove,
+       .remove = st_wdog_remove,
 };
 module_platform_driver(st_wdog_driver);
 

diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
index a8b6cf767117f4248ce426e1ae7fc0b500f609e7..355918d62f63d54ae1efd804c575a655e9d3587d 100644 (file)
--- a/drivers/watchdog/starfive-wdt.c
+++ b/drivers/watchdog/starfive-wdt.c
@@ -597,7 +597,7 @@ MODULE_DEVICE_TABLE(of, starfive_wdt_match);
 
 static struct platform_driver starfive_wdt_driver = {
        .probe = starfive_wdt_probe,
-       .remove_new = starfive_wdt_remove,
+       .remove = starfive_wdt_remove,
        .shutdown = starfive_wdt_shutdown,
        .driver = {
                .name = "starfive-wdt",

diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c
index 4b2caa9807ac83213366bd3a7c29d725123a67e6..060447101f4866d6adbaf1fa8ab3867f1717403a 100644 (file)
--- a/drivers/watchdog/stmp3xxx_rtc_wdt.c
+++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c
@@ -143,7 +143,7 @@ static struct platform_driver stmp3xxx_wdt_driver = {
                .pm = &stmp3xxx_wdt_pm_ops,
        },
        .probe = stmp3xxx_wdt_probe,
-       .remove_new = stmp3xxx_wdt_remove,
+       .remove = stmp3xxx_wdt_remove,
 };
 module_platform_driver(stmp3xxx_wdt_driver);
 

diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index 8d5f67acbff2acdaff3861781fca8c14d494e024..305349844b4f1d906379cc134d50f963e3220313 100644 (file)
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -159,7 +159,7 @@ static void txx9wdt_shutdown(struct platform_device *dev)
 
 static struct platform_driver txx9wdt_driver = {
        .probe = txx9wdt_probe,
-       .remove_new = txx9wdt_remove,
+       .remove = txx9wdt_remove,
        .shutdown = txx9wdt_shutdown,
        .driver = {
                .name = "txx9wdt",