Looks good, ack. Acked-by: Hans de Goede <hdegoede@xxxxxxxxxx> On 03/21/2012 04:25 PM, Alan Cox wrote:
From: Alan Cox<alan@xxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx> --- 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 abefa56..902a3af 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -110,8 +110,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; } @@ -348,7 +347,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); }
-- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html