Re: [PATCH v2 3/4] hwmon: (sch56xx-common) Use helper function

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, May 08, 2021 at 03:14:56PM +0200, W_Armin@xxxxxx wrote:
> From: Armin Wolf <W_Armin@xxxxxx>
> 
> Use watchdog_set_nowayout() to process param
> setting and change param type to bool.
> 
> Signed-off-by: Armin Wolf <W_Armin@xxxxxx>

Applied. Unrelated comment below.

> ---
>  drivers/hwmon/sch56xx-common.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> --
> 2.20.1
> 
> diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
> index 0b3250fc57b8..180801f80118 100644
> --- a/drivers/hwmon/sch56xx-common.c
> +++ b/drivers/hwmon/sch56xx-common.c
> @@ -20,8 +20,8 @@
>  #include "sch56xx-common.h"
> 
>  /* Insmod parameters */
> -static int nowayout = WATCHDOG_NOWAYOUT;
> -module_param(nowayout, int, 0);
> +static bool nowayout = WATCHDOG_NOWAYOUT;
> +module_param(nowayout, bool, 0);
>  MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
>  	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> 
> @@ -420,8 +420,7 @@ void sch56xx_watchdog_register(struct device *parent, u16 addr, u32 revision,
>  	data->wddev.timeout = 60;
>  	data->wddev.min_timeout = 1;
>  	data->wddev.max_timeout = 255 * 60;
> -	if (nowayout)
> -		set_bit(WDOG_NO_WAY_OUT, &data->wddev.status);
> +	watchdog_set_nowayout(&data->wddev, nowayout);
>  	if (output_enable & SCH56XX_WDOG_OUTPUT_ENABLE)
>  		set_bit(WDOG_ACTIVE, &data->wddev.status);
> 
This should really set WDOG_HW_RUNNING.

Guenter



[Index of Archives]     [LM Sensors]     [Linux Sound]     [ALSA Users]     [ALSA Devel]     [Linux Audio Users]     [Linux Media]     [Kernel]     [Gimp]     [Yosemite News]     [Linux Media]

  Powered by Linux