linux-watchdog.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-watchdog@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
	Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: [PATCH 02/16] watchdog: add error messages when initializing timeout fails
Date: Sun, 14 Apr 2019 12:26:13 +0200	[thread overview]
Message-ID: <20190414102627.5564-3-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20190414102627.5564-1-wsa+renesas@sang-engineering.com>

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.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 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 85c136acc0e9..407a5ca121d7 100644
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -124,6 +124,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;
 	}
 
@@ -134,9 +136,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);
-- 
2.11.0


  parent reply	other threads:[~2019-04-14 10:26 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-14 10:26 [PATCH 00/16] watchdog: refactor init_timeout and update users Wolfram Sang
2019-04-14 10:26 ` [PATCH 01/16] watchdog: refactor watchdog_init_timeout Wolfram Sang
2019-04-14 13:25   ` Guenter Roeck
2019-04-14 13:42     ` Wolfram Sang
2019-04-14 14:03       ` Guenter Roeck
2019-04-15  8:21   ` Sergei Shtylyov
2019-04-14 10:26 ` Wolfram Sang [this message]
2019-04-14 10:26 ` [PATCH 03/16] watchdog: cadence_wdt: drop warning after calling watchdog_init_timeout Wolfram Sang
2019-04-14 10:26 ` [PATCH 04/16] watchdog: cadence_wdt: still probe if user supplied timeout is invalid Wolfram Sang
2019-04-14 10:26 ` [PATCH 05/16] watchdog: ebc-c384_wdt: drop warning after calling watchdog_init_timeout Wolfram Sang
2019-04-14 10:26 ` [PATCH 06/16] watchdog: hpwdt: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 07/16] watchdog: i6300esb: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 08/16] watchdog: imx_sc_wdt: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 09/16] watchdog: ni903x_wdt: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 10/16] watchdog: nic7018_wdt: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 11/16] watchdog: renesas_wdt: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 12/16] watchdog: sp5100_tco: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 13/16] watchdog: st_lpc_wdt: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 14/16] watchdog: stm32_iwdg: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 15/16] watchdog: xen_wdt: " Wolfram Sang
2019-04-14 10:26 ` [PATCH 16/16] watchdog: ziirave_wdt: " Wolfram Sang
2019-04-14 10:30 ` [PATCH 00/16] watchdog: refactor init_timeout and update users Wolfram Sang
2019-04-14 15:41 ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190414102627.5564-3-wsa+renesas@sang-engineering.com \
    --to=wsa+renesas@sang-engineering.com \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).