bcm47xx: old gpio wdt: use remove_new

Easy way to add compatibility for kernel 6.12.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18617
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Rosen Penev 2025-04-26 15:54:02 -07:00 committed by Robert Marko
parent 7ec83557d4
commit f09c23fbc9

View file

@ -32,7 +32,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
--- /dev/null --- /dev/null
+++ b/drivers/watchdog/old_gpio_wdt.c +++ b/drivers/watchdog/old_gpio_wdt.c
@@ -0,0 +1,300 @@ @@ -0,0 +1,299 @@
+/* +/*
+ * Driver for GPIO-controlled Hardware Watchdogs. + * Driver for GPIO-controlled Hardware Watchdogs.
+ * + *
@ -277,7 +277,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
+ return 0; + return 0;
+} +}
+ +
+static int gpio_wdt_remove(struct platform_device *pdev) +static void gpio_wdt_remove(struct platform_device *pdev)
+{ +{
+ /* FIXME: do we need to lock this test ? */ + /* FIXME: do we need to lock this test ? */
+ if (gpio_wdt_device.queue) { + if (gpio_wdt_device.queue) {
@ -287,12 +287,11 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
+ +
+ gpio_free(gpio_wdt_device.gpio); + gpio_free(gpio_wdt_device.gpio);
+ misc_deregister(&gpio_wdt_misc); + misc_deregister(&gpio_wdt_misc);
+ return 0;
+} +}
+ +
+static struct platform_driver gpio_wdt_driver = { +static struct platform_driver gpio_wdt_driver = {
+ .probe = gpio_wdt_probe, + .probe = gpio_wdt_probe,
+ .remove = gpio_wdt_remove, + .remove_new = gpio_wdt_remove,
+ .driver.name = "gpio-wdt", + .driver.name = "gpio-wdt",
+}; +};
+ +