From f09c23fbc999d00aa71585902205d98c764a11d8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 26 Apr 2025 15:54:02 -0700 Subject: [PATCH] bcm47xx: old gpio wdt: use remove_new Easy way to add compatibility for kernel 6.12. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/18617 Signed-off-by: Robert Marko --- target/linux/bcm47xx/patches-6.6/831-old_gpio_wdt.patch | 7 +++---- 1 file 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 f7ab33802c6..a3f4710e383 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 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 + 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 + + 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", +}; + -- 2.47.2