Linux-Watchdog Archive on lore.kernel.org
 help / color / Atom feed
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-watchdog@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
	Guenter Roeck <linux@roeck-us.net>,
	Wolfram Sang <wsa+renesas@sang-engineering.com>,
	Wim Van Sebroeck <wim@linux-watchdog.org>,
	linux-kernel@vger.kernel.org
Subject: [PATCH v3 02/16] watchdog: add error messages when initializing timeout fails
Date: Fri, 19 Apr 2019 20:15:47 +0200
Message-ID: <20190419181601.7412-3-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20190419181601.7412-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.

Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/watchdog/watchdog_core.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index 21e53cc49977..62be9e52a4de 100644
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -115,6 +115,8 @@ static void watchdog_check_min_max_timeout(struct watchdog_device *wdd)
 int watchdog_init_timeout(struct watchdog_device *wdd,
 				unsigned int timeout_parm, struct device *dev)
 {
+	const char *dev_str = wdd->parent ? dev_name(wdd->parent) :
+			      (const char *)wdd->info->identity;
 	unsigned int t = 0;
 	int ret = 0;
 
@@ -126,6 +128,8 @@ int watchdog_init_timeout(struct watchdog_device *wdd,
 			wdd->timeout = timeout_parm;
 			return 0;
 		}
+		pr_err("%s: driver supplied timeout (%u) out of range\n",
+			dev_str, timeout_parm);
 		ret = -EINVAL;
 	}
 
@@ -136,9 +140,14 @@ int watchdog_init_timeout(struct watchdog_device *wdd,
 			wdd->timeout = t;
 			return 0;
 		}
+		pr_err("%s: DT supplied timeout (%u) out of range\n", dev_str, t);
 		ret = -EINVAL;
 	}
 
+	if (ret < 0 && wdd->timeout)
+		pr_warn("%s: falling back to default timeout (%u)\n", dev_str,
+			wdd->timeout);
+
 	return ret;
 }
 EXPORT_SYMBOL_GPL(watchdog_init_timeout);
-- 
2.11.0


  parent reply index

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-19 18:15 [PATCH v3 00/16] watchdog: refactor init_timeout and update users Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 01/16] watchdog: refactor watchdog_init_timeout Wolfram Sang
2019-04-19 18:15 ` Wolfram Sang [this message]
2019-04-19 18:15 ` [PATCH v3 03/16] watchdog: cadence_wdt: drop warning after calling watchdog_init_timeout Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 04/16] watchdog: cadence_wdt: still probe if user supplied timeout is invalid Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 05/16] watchdog: ebc-c384_wdt: drop warning after calling watchdog_init_timeout Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 06/16] watchdog: hpwdt: " Wolfram Sang
2019-04-19 21:18   ` Jerry Hoemann
2019-04-19 18:15 ` [PATCH v3 07/16] watchdog: i6300esb: " Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 08/16] watchdog: imx_sc_wdt: " Wolfram Sang
2019-04-29 10:15   ` Uwe Kleine-König
2019-04-29 12:37     ` Guenter Roeck
2019-04-29 13:19       ` Uwe Kleine-König
2019-04-19 18:15 ` [PATCH v3 09/16] watchdog: ni903x_wdt: " Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 10/16] watchdog: nic7018_wdt: " Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 11/16] watchdog: renesas_wdt: " Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 12/16] watchdog: sp5100_tco: " Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 13/16] watchdog: st_lpc_wdt: " Wolfram Sang
2019-04-19 18:15 ` [PATCH v3 14/16] watchdog: stm32_iwdg: " Wolfram Sang
2019-04-19 18:16 ` [PATCH v3 15/16] watchdog: xen_wdt: " Wolfram Sang
2019-04-19 18:16 ` [PATCH v3 16/16] watchdog: ziirave_wdt: " Wolfram Sang

Reply instructions:

You may reply publically 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=20190419181601.7412-3-wsa+renesas@sang-engineering.com \
    --to=wsa+renesas@sang-engineering.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=wim@linux-watchdog.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

Linux-Watchdog Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-watchdog/0 linux-watchdog/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-watchdog linux-watchdog/ https://lore.kernel.org/linux-watchdog \
		linux-watchdog@vger.kernel.org
	public-inbox-index linux-watchdog

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-watchdog


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git