aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.19
diff options
context:
space:
mode:
authorZachary Cook <zachcook1991@gmail.com>2019-07-11 16:09:15 -0400
committerPetr Štetiar <ynezz@true.cz>2019-07-17 22:59:29 +0200
commit4d3c8872f8244eb5aef08cac28771202054114a7 (patch)
tree0a73c6f075481dbb75ce54c05fafae94f36927a3 /target/linux/brcm47xx/patches-4.19
parent0893f28e19afbd9d4081f59df10631d6ef02e0d7 (diff)
downloadupstream-4d3c8872f8244eb5aef08cac28771202054114a7.tar.gz
upstream-4d3c8872f8244eb5aef08cac28771202054114a7.tar.bz2
upstream-4d3c8872f8244eb5aef08cac28771202054114a7.zip
brcm47xx: fix 831-old_gpio_wdt.patch for linux 4.19
Fix the following compilation error when using linux 4.19 on brcm47xx: drivers/watchdog/old_gpio_wdt.c:236:2: error: implicit declaration of function 'setup_timer' setup_timer was removed and replaced by timer_setup in linux >=4.15: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=513ae785 Update the patch to use the timer_setup interface Signed-off-by: Zachary Cook <zachcook1991@gmail.com>
Diffstat (limited to 'target/linux/brcm47xx/patches-4.19')
-rw-r--r--target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch b/target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch
index ddac7917ea..753124f37e 100644
--- a/target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch
+++ b/target/linux/brcm47xx/patches-4.19/831-old_gpio_wdt.patch
@@ -111,7 +111,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
+ int first_interval;
+} gpio_wdt_device;
+
-+static void gpio_wdt_trigger(unsigned long unused)
++static void gpio_wdt_trigger(struct timer_list *unused)
+{
+ spin_lock(&gpio_wdt_device.lock);
+ if (gpio_wdt_device.running && ticks > 0)
@@ -268,7 +268,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
+ init_completion(&gpio_wdt_device.stop);
+ gpio_wdt_device.queue = 0;
+ clear_bit(0, &gpio_wdt_device.inuse);
-+ setup_timer(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L);
++ timer_setup(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L);
+ gpio_wdt_device.default_ticks = ticks;
+
+ gpio_wdt_start();