On Fri, May 06, 2016 at 06:29:41PM +0530, Muhammad Falak R Wani wrote: > The function setup_timer combines the initialization of a timer with > the initialization of the timer's function and data fields. > The multiline code for timer initialization is now replaced > with function setup_timer. > > Signed-off-by: Muhammad Falak R Wani <falakreyaz@xxxxxxxxx> Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx> > --- > drivers/watchdog/shwdt.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c > index f908121..517a733 100644 > --- a/drivers/watchdog/shwdt.c > +++ b/drivers/watchdog/shwdt.c > @@ -275,9 +275,7 @@ static int sh_wdt_probe(struct platform_device *pdev) > return rc; > } > > - init_timer(&wdt->timer); > - wdt->timer.function = sh_wdt_ping; > - wdt->timer.data = (unsigned long)wdt; > + setup_timer(&wdt->timer, sh_wdt_ping, (unsigned long)wdt); > wdt->timer.expires = next_ping_period(clock_division_ratio); > > dev_info(&pdev->dev, "initialized.\n"); > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html