On Fri, May 17, 2019 at 02:59:38PM -0600, Jerry Hoemann wrote: > Have the WD core stop the watchdog on unregister instead of explicitly > calling hpwdt_stop() in hpwdt_exit(). > > Signed-off-by: Jerry Hoemann <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]> > --- > drivers/watchdog/hpwdt.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c > index ef30c7e..8c49f13 100644 > --- a/drivers/watchdog/hpwdt.c > +++ b/drivers/watchdog/hpwdt.c > @@ -310,6 +310,7 @@ static int hpwdt_init_one(struct pci_dev *dev, > if (retval != 0) > goto error_init_nmi_decoding; > > + watchdog_stop_on_unregister(&hpwdt_dev); > watchdog_set_nowayout(&hpwdt_dev, nowayout); > if (watchdog_init_timeout(&hpwdt_dev, soft_margin, NULL)) > dev_warn(&dev->dev, "Invalid soft_margin: %d.\n", soft_margin); > @@ -350,9 +351,6 @@ static int hpwdt_init_one(struct pci_dev *dev, > > static void hpwdt_exit(struct pci_dev *dev) > { > - if (!nowayout) > - hpwdt_stop(); > - > watchdog_unregister_device(&hpwdt_dev); > hpwdt_exit_nmi_decoding(); > pci_iounmap(dev, pci_mem_addr);
