Hi Guenter, On Nov. Monday 02 (45) 06:26 PM, Guenter Roeck wrote: > On 11/02/2015 05:36 PM, Damien Riegel wrote: > >Get rid of the custom restart handler by using the one provided by the > >watchdog core. > > > >Signed-off-by: Damien Riegel <damien.riegel@xxxxxxxxxxxxxxxxxxxx> > >Signed-off-by: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx> <snip> > >@@ -221,23 +222,15 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev) > > if (ret) > > goto err_timer; > > > >- wdt->restart_handler.notifier_call = &bcm47xx_wdt_restart; > >- wdt->restart_handler.priority = 64; > >- ret = register_restart_handler(&wdt->restart_handler); > >- if (ret) > >- goto err_notifier; > >- > > ret = watchdog_register_device(&wdt->wdd); > > if (ret) > >- goto err_handler; > >+ goto err_notifier; > > goto err_handler; I think we want err_notifier here, since it is the label which unregisters the reboot notifier, and err_handler gets removed. > > > > > dev_info(&pdev->dev, "BCM47xx Watchdog Timer enabled (%d seconds%s%s)\n", > > timeout, nowayout ? ", nowayout" : "", > > soft ? ", Software Timer" : ""); > > return 0; > > > >-err_handler: > >- unregister_restart_handler(&wdt->restart_handler); > > err_notifier: > > unregister_reboot_notifier(&wdt->notifier); > > err_timer: Thanks, -v -- 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
