Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d8b229d authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

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: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 0ce72f35

drivers/watchdog/bcm47xx_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ static int bcm47xx_wdt_hard_set_timeout(struct watchdog_device *wdd, 
	return 0;

}



static int bcm47xx_wdt_restart(struct watchdog_device *wdd)

static int bcm47xx_wdt_restart(struct watchdog_device *wdd,

			       unsigned long action, void *data)

{

	struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);

drivers/watchdog/da9063_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ static int da9063_wdt_set_timeout(struct watchdog_device *wdd, 
	return ret;

}



static int da9063_wdt_restart(struct watchdog_device *wdd)

static int da9063_wdt_restart(struct watchdog_device *wdd, unsigned long action,

			      void *data)

{

	struct da9063_watchdog *wdt = watchdog_get_drvdata(wdd);

	int ret;

drivers/watchdog/digicolor_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ static void dc_wdt_set(struct dc_wdt *wdt, u32 ticks) 
	spin_unlock_irqrestore(&wdt->lock, flags);

}



static int dc_wdt_restart(struct watchdog_device *wdog)

static int dc_wdt_restart(struct watchdog_device *wdog, unsigned long action,

			  void *data)

{

	struct dc_wdt *wdt = watchdog_get_drvdata(wdog);

drivers/watchdog/imgpdc_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ static int pdc_wdt_start(struct watchdog_device *wdt_dev) 
	return 0;

}



static int pdc_wdt_restart(struct watchdog_device *wdt_dev)

static int pdc_wdt_restart(struct watchdog_device *wdt_dev,

			   unsigned long action, void *data)

{

	struct pdc_wdt_dev *wdt = watchdog_get_drvdata(wdt_dev);

drivers/watchdog/imx2_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ static const struct watchdog_info imx2_wdt_info = { 
	.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,

};



static int imx2_wdt_restart(struct watchdog_device *wdog)

static int imx2_wdt_restart(struct watchdog_device *wdog, unsigned long action,

			    void *data)

{

	struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog);

	unsigned int wcr_enable = IMX2_WDT_WCR_WDE;