From: Hans de Goede <hdegoede@redhat.com>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-watchdog@vger.kernel.org, wim@iguana.be
Subject: Re: [PATCH 4/4] watchdog: use dev_ functions
Date: Fri, 13 Apr 2012 11:00:21 +0200 [thread overview]
Message-ID: <4F87EB25.6050709@redhat.com> (raw)
In-Reply-To: <20120321152532.20045.87765.stgit@bob.linux.org.uk>
Looks good, ack.
Acked-by: Hans de Goede <hdegoede@redhat.com>
On 03/21/2012 04:25 PM, Alan Cox wrote:
> From: Alan Cox<alan@linux.intel.com>
>
> 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>
> ---
>
> 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);
> }
>
>
next prev parent reply other threads:[~2012-04-13 8:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 15:24 [PATCH 1/4] watchdog: Add multiple device support Alan Cox
2012-03-21 15:25 ` [PATCH 2/4] watchdog: Add a flag to indicate the watchdog doesn't reboot things Alan Cox
2012-04-13 8:58 ` Hans de Goede
2012-04-24 19:35 ` Wim Van Sebroeck
2012-03-21 15:25 ` [PATCH 3/4] watchdog: create all the proper device files Alan Cox
2012-04-13 8:59 ` Hans de Goede
2012-03-21 15:25 ` [PATCH 4/4] watchdog: use dev_ functions Alan Cox
2012-04-13 9:00 ` Hans de Goede [this message]
2012-04-13 8:57 ` [PATCH 1/4] watchdog: Add multiple device support Hans de Goede
2012-05-04 12:38 ` Wim Van Sebroeck
2012-05-10 19:20 ` Wim Van Sebroeck
2012-05-11 7:50 ` Hans de Goede
2012-05-11 8:42 ` Hans de Goede
2012-05-11 16:02 ` Wim Van Sebroeck
2012-05-11 16:40 ` Hans de Goede
2012-05-13 12:15 ` Tomas Winkler
2012-05-14 13:35 ` Wim Van Sebroeck
2012-05-11 9:58 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F87EB25.6050709@redhat.com \
--to=hdegoede@redhat.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).