summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/s3c2410_wdt.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-02-27 02:32:49 +0100
committerWim Van Sebroeck <wim@iguana.be>2016-03-01 15:36:35 +0100
commit4d8b229d5ea610affe672e919021e9d02cd877da (patch)
treea5f42d4a023b28deae9d5944058cd862423be30e /drivers/watchdog/s3c2410_wdt.c
parentwatchdog: ziirave_wdt: Rename "trigger" reset reason "hw watchdog" (diff)
downloadlinux-4d8b229d5ea610affe672e919021e9d02cd877da.tar.xz
linux-4d8b229d5ea610affe672e919021e9d02cd877da.zip
watchdog: Add 'action' and 'data' parameters to restart handler callback
The 'action' (or restart mode) and data parameters may be used by restart handlers, so they should be passed to the restart callback functions. Cc: Sylvain Lemieux <slemieux@tycoint.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/s3c2410_wdt.c')
-rw-r--r--drivers/watchdog/s3c2410_wdt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 0093450441fe..d57f19b5077f 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -349,7 +349,8 @@ static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeou
return 0;
}
-static int s3c2410wdt_restart(struct watchdog_device *wdd)
+static int s3c2410wdt_restart(struct watchdog_device *wdd, unsigned long action,
+ void *data)
{
struct s3c2410_wdt *wdt = watchdog_get_drvdata(wdd);
void __iomem *wdt_base = wdt->reg_base;