linux-watchdog.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: linux-watchdog@vger.kernel.org
Cc: Wim Van Sebroeck <wim@iguana.be>,
	Damien Riegel <damien.riegel@savoirfairelinux.com>,
	linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 3/5] watchdog: gpio: Do not use device pointer from struct watchdog_device
Date: Wed, 23 Dec 2015 21:11:31 -0800	[thread overview]
Message-ID: <1450933893-7761-4-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1450933893-7761-1-git-send-email-linux@roeck-us.net>

The device pointer in struct watchdog_device has a different lifetime
than the driver code and should not be used in drivers. Use pr_crit
instead of dev_crit.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/watchdog/gpio_wdt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
index 035c2387b846..44df983a1232 100644
--- a/drivers/watchdog/gpio_wdt.c
+++ b/drivers/watchdog/gpio_wdt.c
@@ -9,6 +9,8 @@
  * (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/module.h>
@@ -54,7 +56,8 @@ static void gpio_wdt_hwping(unsigned long data)
 
 	if (priv->armed && time_after(jiffies, priv->last_jiffies +
 				      msecs_to_jiffies(wdd->timeout * 1000))) {
-		dev_crit(wdd->dev, "Timer expired. System will reboot soon!\n");
+		pr_crit("watchdog%d: Timer expired. System will reboot soon!\n",
+			wdd->id);
 		return;
 	}
 
-- 
2.1.4

  parent reply	other threads:[~2015-12-24  5:11 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-24  5:11 [PATCH 0/5] watchdog: Do not use 'dev' from watchdog_device in watchdog drivers Guenter Roeck
2015-12-24  5:11 ` [PATCH 1/5] watchdog: bcm2835_wdt: Drop log message if watchdog is stopped Guenter Roeck
2015-12-24  5:11 ` [PATCH 2/5] watchdog: tangox: Print info message using pointer to platform device Guenter Roeck
2015-12-24  5:11 ` Guenter Roeck [this message]
2015-12-24  5:11 ` [PATCH 4/5] watchdog: mena21: Do not use device pointer from struct watchdog_device Guenter Roeck
2015-12-24  5:11 ` [PATCH 5/5] watchdog: qcom-wdt: Do not set 'dev' in " Guenter Roeck
2015-12-24 15:07 ` [PATCH 0/5] watchdog: Do not use 'dev' from watchdog_device in watchdog drivers Damien Riegel
2015-12-24 15:25   ` 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=1450933893-7761-4-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=damien.riegel@savoirfairelinux.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=wim@iguana.be \
    /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).