diff options
author | Alan Cox <alan@linux.intel.com> | 2012-05-11 06:00:22 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2012-05-30 01:54:57 -0400 |
commit | 3dfd6218da4cb9d0eae596581a08de9959aa2b1f (patch) | |
tree | a0f7b4f14260a2f47fe831190ea1704d23fc548d /drivers/watchdog | |
parent | d6b469d915ae348b3bb8b25034063d6870ff4a00 (diff) |
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.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 1f011f2d6e48..55191cccf026 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) | |||
108 | int err = -EBUSY; | 108 | int err = -EBUSY; |
109 | 109 | ||
110 | if (test_bit(WDOG_NO_WAY_OUT, &wddev->status)) { | 110 | if (test_bit(WDOG_NO_WAY_OUT, &wddev->status)) { |
111 | pr_info("%s: nowayout prevents watchdog to be stopped!\n", | 111 | dev_info(wddev->dev, "nowayout prevents watchdog being stopped!\n"); |
112 | wddev->info->identity); | ||
113 | return err; | 112 | return err; |
114 | } | 113 | } |
115 | 114 | ||
@@ -324,7 +323,7 @@ static int watchdog_release(struct inode *inode, struct file *file) | |||
324 | 323 | ||
325 | /* If the watchdog was not stopped, send a keepalive ping */ | 324 | /* If the watchdog was not stopped, send a keepalive ping */ |
326 | if (err < 0) { | 325 | if (err < 0) { |
327 | pr_crit("%s: watchdog did not stop!\n", wdd->info->identity); | 326 | dev_crit(wdd->dev, "watchdog did not stop!\n"); |
328 | watchdog_ping(wdd); | 327 | watchdog_ping(wdd); |
329 | } | 328 | } |
330 | 329 | ||