[PATCH] Rename "trigger" reset reason "hw watchdog"

[PATCH] Rename "trigger" reset reason "hw watchdog"

[Martyn Welch]

The Zodiac watchdog is implemented on a microcontoller. The reset reason
currently labelled "trigger" is not to detect when the watchdog has
triggered (as had been initially understood and suggested by the naming),
but to inform the reader that the watchdog, which in fact has it's own
hardware watchdog, has been reset because the hardware watchdog has
triggered. Renaming to "hw watchdog".

Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
---
 drivers/watchdog/ziirave_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
index 0c7cb73..cbe373de 100644
--- a/drivers/watchdog/ziirave_wdt.c
+++ b/drivers/watchdog/ziirave_wdt.c
@@ -36,7 +36,7 @@
 #define ZIIRAVE_STATE_OFF	0x1
 #define ZIIRAVE_STATE_ON	0x2
 
-static char *ziirave_reasons[] = {"power cycle", "triggered", NULL, NULL,
+static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL,
 				  "host request", NULL, "illegal configuration",
 				  "illegal instruction", "illegal trap",
 				  "unknown"};
-- 
2.1.4

Re: [PATCH] Rename "trigger" reset reason "hw watchdog"

[Guenter Roeck]

On 02/26/2016 08:05 AM, Martyn Welch wrote:
> The Zodiac watchdog is implemented on a microcontoller. The reset reason
> currently labelled "trigger" is not to detect when the watchdog has
> triggered (as had been initially understood and suggested by the naming),
> but to inform the reader that the watchdog, which in fact has it's own
> hardware watchdog, has been reset because the hardware watchdog has
> triggered. Renaming to "hw watchdog".
>
> Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/watchdog/ziirave_wdt.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
> index 0c7cb73..cbe373de 100644
> --- a/drivers/watchdog/ziirave_wdt.c
> +++ b/drivers/watchdog/ziirave_wdt.c
> @@ -36,7 +36,7 @@
>   #define ZIIRAVE_STATE_OFF	0x1
>   #define ZIIRAVE_STATE_ON	0x2
>
> -static char *ziirave_reasons[] = {"power cycle", "triggered", NULL, NULL,
> +static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL,
>   				  "host request", NULL, "illegal configuration",
>   				  "illegal instruction", "illegal trap",
>   				  "unknown"};
>

Re: [PATCH] Rename "trigger" reset reason "hw watchdog"

[Wim Van Sebroeck]

Hi Martyn,

> The Zodiac watchdog is implemented on a microcontoller. The reset reason
> currently labelled "trigger" is not to detect when the watchdog has
> triggered (as had been initially understood and suggested by the naming),
> but to inform the reader that the watchdog, which in fact has it's own
> hardware watchdog, has been reset because the hardware watchdog has
> triggered. Renaming to "hw watchdog".
> 
> Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
> ---
>  drivers/watchdog/ziirave_wdt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
> index 0c7cb73..cbe373de 100644
> --- a/drivers/watchdog/ziirave_wdt.c
> +++ b/drivers/watchdog/ziirave_wdt.c
> @@ -36,7 +36,7 @@
>  #define ZIIRAVE_STATE_OFF	0x1
>  #define ZIIRAVE_STATE_ON	0x2
>  
> -static char *ziirave_reasons[] = {"power cycle", "triggered", NULL, NULL,
> +static char *ziirave_reasons[] = {"power cycle", "hw watchdog", NULL, NULL,
>  				  "host request", NULL, "illegal configuration",
>  				  "illegal instruction", "illegal trap",
>  				  "unknown"};
> -- 
> 2.1.4
> 

Patch has been added to linux-watchdog-next.

Kind regards,
Wim.