Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 09:56:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchdog: Switch back to struct platform_driver::remove()

Browse Source 
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>
This commit is contained in:
Uwe Kleine-König 2024-10-10 22:36:22 +02:00 committed by Wim Van Sebroeck
parent 4343907638
commit 562b0b0319
31 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/acquirewdt.c
View File

@ -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,

2
drivers/watchdog/advantechwdt.c
View File

@ -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,

2
drivers/watchdog/at91rm9200_wdt.c
View File

@ -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),

2
drivers/watchdog/at91sam9_wdt.c
View File

@ -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),

2
drivers/watchdog/ath79_wdt.c
View File

@ -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,

2
drivers/watchdog/bcm2835_wdt.c
View File

@ -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",
},

2
drivers/watchdog/bcm_kona_wdt.c
View File

@ -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);

2
drivers/watchdog/cpwd.c
View File

@ -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);

2
drivers/watchdog/dw_wdt.c
View File

@ -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),

2
drivers/watchdog/gef_wdt.c
View File

@ -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)

2
drivers/watchdog/geodewdt.c
View File

@ -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,

2
drivers/watchdog/ib700wdt.c
View File

@ -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,

2
drivers/watchdog/ie6xx_wdt.c
View File

@ -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,
},

2
drivers/watchdog/lpc18xx_wdt.c
View File

@ -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);

2
drivers/watchdog/mtx-1_wdt.c
View File

@ -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",
};

2
drivers/watchdog/nic7018_wdt.c
View File

@ -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),

2
drivers/watchdog/nv_tco.c
View File

@ -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,

2
drivers/watchdog/omap_wdt.c
View File

@ -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),

2
drivers/watchdog/orion_wdt.c
View File

@ -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",

2
drivers/watchdog/rc32434_wdt.c
View File

@ -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",

2
drivers/watchdog/rdc321x_wdt.c
View File

@ -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",
},

2
drivers/watchdog/renesas_wdt.c
View File

@ -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);

2
drivers/watchdog/riowd.c
View File

@ -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);

2
drivers/watchdog/rti_wdt.c
View File

@ -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);

4
drivers/watchdog/sa1100_wdt.c
View File

@ -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);

2
drivers/watchdog/sch311x_wdt.c
View File

@ -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,

2
drivers/watchdog/shwdt.c
View File

@ -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,
};

2
drivers/watchdog/st_lpc_wdt.c
View File

@ -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);

2
drivers/watchdog/starfive-wdt.c
View File

@ -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",

2
drivers/watchdog/stmp3xxx_rtc_wdt.c
View File

@ -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);

2
drivers/watchdog/txx9wdt.c
View File

@ -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",