From a17243e05daa09a364d66c4cc8d149c729a234d9 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 11 May 2012 12:00:22 +0200 Subject: [PATCH] --- yaml --- r: 309389 b: refs/heads/master c: 3dfd6218da4cb9d0eae596581a08de9959aa2b1f h: refs/heads/master i: 309387: 4f59f7376d222b36acb68b3a36e2adeefe7b2e71 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/watchdog_dev.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf185b4249f7..382e466d81a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6b469d915ae348b3bb8b25034063d6870ff4a00 +refs/heads/master: 3dfd6218da4cb9d0eae596581a08de9959aa2b1f diff --git a/trunk/drivers/watchdog/watchdog_dev.c b/trunk/drivers/watchdog/watchdog_dev.c index 1f011f2d6e48..55191cccf026 100644 --- a/trunk/drivers/watchdog/watchdog_dev.c +++ b/trunk/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); }