watchdog/hpwdt: Stop hpwdt on unregister.
Have the WD core stop the watchdog on unregister instead of explicitly calling hpwdt_stop() in hpwdt_exit(). Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Родитель
215e06f0d1
Коммит
48b32199f9
|
@ -306,6 +306,7 @@ static int hpwdt_init_one(struct pci_dev *dev,
|
||||||
if (retval != 0)
|
if (retval != 0)
|
||||||
goto error_init_nmi_decoding;
|
goto error_init_nmi_decoding;
|
||||||
|
|
||||||
|
watchdog_stop_on_unregister(&hpwdt_dev);
|
||||||
watchdog_set_nowayout(&hpwdt_dev, nowayout);
|
watchdog_set_nowayout(&hpwdt_dev, nowayout);
|
||||||
watchdog_init_timeout(&hpwdt_dev, soft_margin, NULL);
|
watchdog_init_timeout(&hpwdt_dev, soft_margin, NULL);
|
||||||
|
|
||||||
|
@ -343,9 +344,6 @@ error_pci_iomap:
|
||||||
|
|
||||||
static void hpwdt_exit(struct pci_dev *dev)
|
static void hpwdt_exit(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
if (!nowayout)
|
|
||||||
hpwdt_stop();
|
|
||||||
|
|
||||||
watchdog_unregister_device(&hpwdt_dev);
|
watchdog_unregister_device(&hpwdt_dev);
|
||||||
hpwdt_exit_nmi_decoding();
|
hpwdt_exit_nmi_decoding();
|
||||||
pci_iounmap(dev, pci_mem_addr);
|
pci_iounmap(dev, pci_mem_addr);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче