Skip to content

Commit

Permalink
watchdog: use dev_ functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Wim Van Sebroeck committed May 30, 2012
1 parent d6b469d commit 3dfd621
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/watchdog/watchdog_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 3dfd621

Please sign in to comment.