Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760137AbcCDTkW (ORCPT ); Fri, 4 Mar 2016 14:40:22 -0500 Received: from spo001.leaseweb.nl ([83.149.101.17]:48345 "EHLO spo001.leaseweb.nl" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1759080AbcCDTkU (ORCPT ); Fri, 4 Mar 2016 14:40:20 -0500 Date: Fri, 4 Mar 2016 20:40:17 +0100 From: Wim Van Sebroeck To: Martyn Welch Cc: Guenter Roeck , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] Rename "trigger" reset reason "hw watchdog" Message-ID: <20160304194017.GG6900@spo001.leaseweb.nl> References: <1456502712-25965-1-git-send-email-martyn.welch@collabora.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1456502712-25965-1-git-send-email-martyn.welch@collabora.co.uk> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1222 Lines: 35 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 > --- > 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.