From patchwork Tue Apr 16 10:25:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 10902671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 526471515 for ; Tue, 16 Apr 2019 10:26:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38A98283BB for ; Tue, 16 Apr 2019 10:26:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CE9C289B2; Tue, 16 Apr 2019 10:26:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F5FA283BB for ; Tue, 16 Apr 2019 10:26:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729048AbfDPK0s (ORCPT ); Tue, 16 Apr 2019 06:26:48 -0400 Received: from sauhun.de ([88.99.104.3]:48636 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727037AbfDPKZ0 (ORCPT ); Tue, 16 Apr 2019 06:25:26 -0400 Received: from localhost (p54B332D3.dip0.t-ipconnect.de [84.179.50.211]) by pokefinder.org (Postfix) with ESMTPSA id 2C90B2E354E; Tue, 16 Apr 2019 12:25:24 +0200 (CEST) From: Wolfram Sang To: linux-watchdog@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Guenter Roeck , Wolfram Sang , Wim Van Sebroeck , linux-kernel@vger.kernel.org Subject: [PATCH v2 02/16] watchdog: add error messages when initializing timeout fails Date: Tue, 16 Apr 2019 12:25:01 +0200 Message-Id: <20190416102515.12269-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190416102515.12269-1-wsa+renesas@sang-engineering.com> References: <20190416102515.12269-1-wsa+renesas@sang-engineering.com> Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This not only removes boilerplate code from watchdog drivers, it can also be more specific which of the supplied value actually fails. Also, the loglevel becomes now consistent across drivers. Reviewed-by: Guenter Roeck Signed-off-by: Wolfram Sang --- drivers/watchdog/watchdog_core.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index 21e53cc49977..cd3ca6b366ef 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -126,6 +126,8 @@ int watchdog_init_timeout(struct watchdog_device *wdd, wdd->timeout = timeout_parm; return 0; } + dev_err(dev, "driver supplied timeout (%u) out of range\n", + timeout_parm); ret = -EINVAL; } @@ -136,9 +138,13 @@ int watchdog_init_timeout(struct watchdog_device *wdd, wdd->timeout = t; return 0; } + dev_err(dev, "DT supplied timeout (%u) out of range\n", t); ret = -EINVAL; } + if (ret < 0 && wdd->timeout) + dev_warn(dev, "falling back to default timeout (%u)\n", wdd->timeout); + return ret; } EXPORT_SYMBOL_GPL(watchdog_init_timeout);