On Wed, May 25, 2016 at 08:37:46AM +0200, Wolfram Sang wrote: > From: Wolfram Sang <[email protected]> > > Signed-off-by: Wolfram Sang <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]> > --- > drivers/watchdog/softdog.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c > index 0a29f5a0833787..42faa3d424d5ca 100644 > --- a/drivers/watchdog/softdog.c > +++ b/drivers/watchdog/softdog.c > @@ -54,11 +54,6 @@ module_param(soft_panic, int, 0); > MODULE_PARM_DESC(soft_panic, > "Softdog action, set to 1 to panic, 0 to reboot (default=0)"); > > -static void softdog_fire(unsigned long); > - > -static struct timer_list softdog_ticktock = > - TIMER_INITIALIZER(softdog_fire, 0, 0); > - > static void softdog_fire(unsigned long data) > { > module_put(THIS_MODULE); > @@ -74,6 +69,9 @@ static void softdog_fire(unsigned long data) > } > } > > +static struct timer_list softdog_ticktock = > + TIMER_INITIALIZER(softdog_fire, 0, 0); > + > static int softdog_ping(struct watchdog_device *w) > { > if (!mod_timer(&softdog_ticktock, jiffies+(w->timeout*HZ))) > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html
