summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev2025-04-26 22:54:02 +0000
committerRobert Marko2025-04-28 08:31:59 +0000
commitf09c23fbc999d00aa71585902205d98c764a11d8 (patch)
tree7e3fa5ace595a983cc0a91ad8ed2cbcaa3ff3dcc
parent7ec83557d4f8c8b40f4a5904288a470c9d2f0a43 (diff)
downloadopenwrt-f09c23fbc999d00aa71585902205d98c764a11d8.tar.gz
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>
-rw-r--r--target/linux/bcm47xx/patches-6.6/831-old_gpio_wdt.patch7
1 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/bcm47xx/patches-6.6/831-old_gpio_wdt.patch b/target/linux/bcm47xx/patches-6.6/831-old_gpio_wdt.patch
index f7ab33802c..a3f4710e38 100644
--- a/target/linux/bcm47xx/patches-6.6/831-old_gpio_wdt.patch
+++ b/target/linux/bcm47xx/patches-6.6/831-old_gpio_wdt.patch
@@ -32,7 +32,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
--- /dev/null
+++ b/drivers/watchdog/old_gpio_wdt.c
-@@ -0,0 +1,300 @@
+@@ -0,0 +1,299 @@
+/*
+ * Driver for GPIO-controlled Hardware Watchdogs.
+ *
@@ -277,7 +277,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
+ 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 ? */
+ 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);
+ misc_deregister(&gpio_wdt_misc);
-+ return 0;
+}
+
+static struct platform_driver gpio_wdt_driver = {
+ .probe = gpio_wdt_probe,
-+ .remove = gpio_wdt_remove,
++ .remove_new = gpio_wdt_remove,
+ .driver.name = "gpio-wdt",
+};
+