summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-05-11 12:00:22 +0200
committerWim Van Sebroeck <wim@iguana.be>2012-05-30 07:54:57 +0200
commit3dfd6218da4cb9d0eae596581a08de9959aa2b1f (patch)
treea0f7b4f14260a2f47fe831190ea1704d23fc548d /drivers/watchdog
parentd6b469d915ae348b3bb8b25034063d6870ff4a00 (diff)
downloadop-kernel-dev-3dfd6218da4cb9d0eae596581a08de9959aa2b1f.zip
op-kernel-dev-3dfd6218da4cb9d0eae596581a08de9959aa2b1f.tar.gz
watchdog: use dev_ functions
While they are registered all our watchdogs now have a valid device object so we can in turn use that to report problems nicely. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/watchdog_dev.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 1f011f2..55191cc 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -108,8 +108,7 @@ static int watchdog_stop(struct watchdog_device *wddev)
int err = -EBUSY;
if (test_bit(WDOG_NO_WAY_OUT, &wddev->status)) {
- pr_info("%s: nowayout prevents watchdog to be stopped!\n",
- wddev->info->identity);
+ dev_info(wddev->dev, "nowayout prevents watchdog being stopped!\n");
return err;
}
@@ -324,7 +323,7 @@ static int watchdog_release(struct inode *inode, struct file *file)
/* If the watchdog was not stopped, send a keepalive ping */
if (err < 0) {
- pr_crit("%s: watchdog did not stop!\n", wdd->info->identity);
+ dev_crit(wdd->dev, "watchdog did not stop!\n");
watchdog_ping(wdd);
}
OpenPOWER on IntegriCloud