From: Wolfram Sang <wsa@the-dreams.de>
To: Guenter Roeck <linux@roeck-us.net>
Cc: Jerry Hoemann <jerry.hoemann@hpe.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
linux-watchdog@vger.kernel.org,
linux-renesas-soc@vger.kernel.org,
Wim Van Sebroeck <wim@linux-watchdog.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 06/16] watchdog: hpwdt: drop warning after calling watchdog_init_timeout
Date: Wed, 17 Apr 2019 21:45:28 +0200 [thread overview]
Message-ID: <20190417194528.xwivkyubhxyfrx4m@ninjato> (raw)
In-Reply-To: <20190416223813.GA744@roeck-us.net>
[-- Attachment #1: Type: text/plain, Size: 1846 bytes --]
> Yes, that works as well. Note that it will actually print something like
> "watchdog: <device>: ..." due to the pr_fmt() at the top of watchdog_core.c.
> I guess that should be ok.
I have the following diff applied on top of patch 2. Works with and
without a parent device. I am not super happy casting 'identity' but
since its u8-type is exported to userspace, I think we can't avoid it.
Guenter, is this cast safe? Here is the diff:
diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index cd3ca6b366ef..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,8 +128,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);
+ pr_err("%s: driver supplied timeout (%u) out of range\n",
+ dev_str, timeout_parm);
ret = -EINVAL;
}
@@ -138,12 +140,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);
+ pr_err("%s: DT supplied timeout (%u) out of range\n", dev_str, t);
ret = -EINVAL;
}
if (ret < 0 && wdd->timeout)
- dev_warn(dev, "falling back to default timeout (%u)\n", wdd->timeout);
+ pr_warn("%s: falling back to default timeout (%u)\n", dev_str,
+ wdd->timeout);
return ret;
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-04-17 19:45 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 10:24 [PATCH v2 00/16] watchdog: refactor init_timeout and update users Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 01/16] watchdog: refactor watchdog_init_timeout Wolfram Sang
2019-04-16 13:23 ` Guenter Roeck
2019-04-16 10:25 ` [PATCH v2 02/16] watchdog: add error messages when initializing timeout fails Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 03/16] watchdog: cadence_wdt: drop warning after calling watchdog_init_timeout Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 04/16] watchdog: cadence_wdt: still probe if user supplied timeout is invalid Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 05/16] watchdog: ebc-c384_wdt: drop warning after calling watchdog_init_timeout Wolfram Sang
2019-04-16 10:28 ` William Breathitt Gray
2019-04-16 10:25 ` [PATCH v2 06/16] watchdog: hpwdt: " Wolfram Sang
2019-04-16 20:34 ` Jerry Hoemann
2019-04-16 20:48 ` Guenter Roeck
2019-04-16 20:55 ` Wolfram Sang
2019-04-16 21:20 ` Guenter Roeck
2019-04-16 22:17 ` Wolfram Sang
2019-04-16 22:38 ` Guenter Roeck
2019-04-17 19:45 ` Wolfram Sang [this message]
2019-04-17 20:17 ` Guenter Roeck
2019-04-17 21:18 ` Wolfram Sang
2019-04-17 22:00 ` Guenter Roeck
2019-04-24 8:38 ` Geert Uytterhoeven
2019-04-24 12:57 ` Guenter Roeck
2019-04-16 20:50 ` Wolfram Sang
2019-04-16 21:14 ` Guenter Roeck
2019-04-16 10:25 ` [PATCH v2 07/16] watchdog: i6300esb: " Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 08/16] watchdog: imx_sc_wdt: " Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 09/16] watchdog: ni903x_wdt: " Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 10/16] watchdog: nic7018_wdt: " Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 11/16] watchdog: renesas_wdt: " Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 12/16] watchdog: sp5100_tco: " Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 13/16] watchdog: st_lpc_wdt: " Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 14/16] watchdog: stm32_iwdg: " Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 15/16] watchdog: xen_wdt: " Wolfram Sang
2019-04-16 10:25 ` [PATCH v2 16/16] watchdog: ziirave_wdt: " Wolfram Sang
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=20190417194528.xwivkyubhxyfrx4m@ninjato \
--to=wsa@the-dreams.de \
--cc=jerry.hoemann@hpe.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 \
--cc=wsa+renesas@sang-engineering.com \
/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).