summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/meson_wdt.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-02-26 17:32:49 -0800
committerWim Van Sebroeck <wim@iguana.be>2016-03-01 15:36:35 +0100
commit4d8b229d5ea610affe672e919021e9d02cd877da (patch)
treea5f42d4a023b28deae9d5944058cd862423be30e /drivers/watchdog/meson_wdt.c
parent0ce72f354482cfa40fb0a6619511ab94d6daa5e9 (diff)
downloadblackbird-op-linux-4d8b229d5ea610affe672e919021e9d02cd877da.tar.gz
blackbird-op-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/meson_wdt.c')
-rw-r--r--drivers/watchdog/meson_wdt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index aea5d2f44ad7..56ea1caf71c3 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -62,7 +62,8 @@ struct meson_wdt_dev {
const struct meson_wdt_data *data;
};
-static int meson_wdt_restart(struct watchdog_device *wdt_dev)
+static int meson_wdt_restart(struct watchdog_device *wdt_dev,
+ unsigned long action, void *data)
{
struct meson_wdt_dev *meson_wdt = watchdog_get_drvdata(wdt_dev);
u32 tc_reboot = MESON_WDT_DC_RESET;
OpenPOWER on IntegriCloud