]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING
authorArmin Wolf <W_Armin@gmx.de>
Mon, 31 Jan 2022 21:19:35 +0000 (22:19 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:40:00 +0000 (14:40 +0200)
[ Upstream commit 647d6f09bea7dacf4cdb6d4ea7e3051883955297 ]

If the watchdog was already enabled by the BIOS after booting, the
watchdog infrastructure needs to regularly send keepalives to
prevent a unexpected reset.
WDOG_ACTIVE only serves as an status indicator for userspace,
we want to use WDOG_HW_RUNNING instead.

Since my Fujitsu Esprimo P720 does not support the watchdog,
this change is compile-tested only.

Suggested-by: Guenter Roeck <linux@roeck-us.net>
Fixes: fb551405c0f8 (watchdog: sch56xx: Use watchdog core)
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20220131211935.3656-5-W_Armin@gmx.de
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/hwmon/sch56xx-common.c

index 6c84780e358e8d12cc21a73deaa4644ae637ec0c..066b12990fbfb6f97ee7f16beb174ab388595013 100644 (file)
@@ -424,7 +424,7 @@ struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent,
        if (nowayout)
                set_bit(WDOG_NO_WAY_OUT, &data->wddev.status);
        if (output_enable & SCH56XX_WDOG_OUTPUT_ENABLE)
-               set_bit(WDOG_ACTIVE, &data->wddev.status);
+               set_bit(WDOG_HW_RUNNING, &data->wddev.status);
 
        /* Since the watchdog uses a downcounter there is no register to read
           the BIOS set timeout from (if any was set at all) ->