* [PATCH] [v2] watchdog: booke_wdt: clean up status messages
@ 2011-02-08 23:39 Timur Tabi
2011-03-15 15:42 ` Kumar Gala
0 siblings, 1 reply; 4+ messages in thread
From: Timur Tabi @ 2011-02-08 23:39 UTC (permalink / raw)
To: benh, linuxppc-dev, wim, linux-watchdog
Improve the status messages that are displayed during some operations of the
PowerPC watchdog timer driver. When the watchdog is enabled, the timeout is
displayed as a number of seconds, instead of an obscure "period". The "period"
is the position of a bit in a 64-bit timer register. The higher the value,
the quicker the watchdog timeout occurs. Some people chose a high "period"
value for the timer and get confused as to why the board resets within a
few seconds.
Messages displayed during open and close are now debug messages, so that they
don't clutter the console by default. Finally, printk() is replaced with the
pr_xxx() equivalent.
Signed-off-by: Timur Tabi <timur@freescale.com>
---
drivers/watchdog/booke_wdt.c | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index 7e7ec9c..337265b 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -4,7 +4,7 @@
* Author: Matthew McClintock
* Maintainer: Kumar Gala <galak@kernel.crashing.org>
*
- * Copyright 2005, 2008, 2010 Freescale Semiconductor Inc.
+ * Copyright 2005, 2008, 2010-2011 Freescale Semiconductor Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -221,9 +221,8 @@ static int booke_wdt_open(struct inode *inode, struct file *file)
if (booke_wdt_enabled == 0) {
booke_wdt_enabled = 1;
on_each_cpu(__booke_wdt_enable, NULL, 0);
- printk(KERN_INFO
- "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
- booke_wdt_period);
+ pr_debug("booke_wdt: watchdog enabled (timeout = %llu sec)\n",
+ period_to_sec(booke_wdt_period));
}
spin_unlock(&booke_wdt_lock);
@@ -240,6 +239,7 @@ static int booke_wdt_release(struct inode *inode, struct file *file)
*/
on_each_cpu(__booke_wdt_disable, NULL, 0);
booke_wdt_enabled = 0;
+ pr_debug("booke_wdt: watchdog disabled\n");
#endif
clear_bit(0, &wdt_is_active);
@@ -271,21 +271,20 @@ static int __init booke_wdt_init(void)
{
int ret = 0;
- printk(KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n");
+ pr_info("booke_wdt: powerpc book-e watchdog driver loaded\n");
ident.firmware_version = cur_cpu_spec->pvr_value;
ret = misc_register(&booke_wdt_miscdev);
if (ret) {
- printk(KERN_CRIT "Cannot register miscdev on minor=%d: %d\n",
- WATCHDOG_MINOR, ret);
+ pr_err("booke_wdt: cannot register device (minor=%u, ret=%i)\n",
+ WATCHDOG_MINOR, ret);
return ret;
}
spin_lock(&booke_wdt_lock);
if (booke_wdt_enabled == 1) {
- printk(KERN_INFO
- "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
- booke_wdt_period);
+ pr_info("booke_wdt: watchdog enabled (timeout = %llu sec)\n",
+ period_to_sec(booke_wdt_period));
on_each_cpu(__booke_wdt_enable, NULL, 0);
}
spin_unlock(&booke_wdt_lock);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] [v2] watchdog: booke_wdt: clean up status messages
2011-02-08 23:39 [PATCH] [v2] watchdog: booke_wdt: clean up status messages Timur Tabi
@ 2011-03-15 15:42 ` Kumar Gala
2011-03-15 18:19 ` Wim Van Sebroeck
0 siblings, 1 reply; 4+ messages in thread
From: Kumar Gala @ 2011-03-15 15:42 UTC (permalink / raw)
To: Timur Tabi; +Cc: wim, linux-watchdog, linuxppc-dev
On Feb 8, 2011, at 5:39 PM, Timur Tabi wrote:
> Improve the status messages that are displayed during some operations =
of the
> PowerPC watchdog timer driver. When the watchdog is enabled, the =
timeout is
> displayed as a number of seconds, instead of an obscure "period". The =
"period"
> is the position of a bit in a 64-bit timer register. The higher the =
value,
> the quicker the watchdog timeout occurs. Some people chose a high =
"period"
> value for the timer and get confused as to why the board resets within =
a
> few seconds.
>=20
> Messages displayed during open and close are now debug messages, so =
that they
> don't clutter the console by default. Finally, printk() is replaced =
with the
> pr_xxx() equivalent.
>=20
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> drivers/watchdog/booke_wdt.c | 19 +++++++++----------
> 1 files changed, 9 insertions(+), 10 deletions(-)
applied
- k=
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] [v2] watchdog: booke_wdt: clean up status messages
2011-03-15 15:42 ` Kumar Gala
@ 2011-03-15 18:19 ` Wim Van Sebroeck
2011-03-15 18:47 ` Kumar Gala
0 siblings, 1 reply; 4+ messages in thread
From: Wim Van Sebroeck @ 2011-03-15 18:19 UTC (permalink / raw)
To: Kumar Gala; +Cc: wim, linux-watchdog, Timur Tabi, linuxppc-dev
Hi Kumar,
I allready had it in the watchdog tree for a couple of weeks (and thus also in linux-next).
Are you going to sent it of to Linus or will I sent it over via the watchdog tree?
Thanks in advance,
Wim.
>
> On Feb 8, 2011, at 5:39 PM, Timur Tabi wrote:
>
> > Improve the status messages that are displayed during some operations of the
> > PowerPC watchdog timer driver. When the watchdog is enabled, the timeout is
> > displayed as a number of seconds, instead of an obscure "period". The "period"
> > is the position of a bit in a 64-bit timer register. The higher the value,
> > the quicker the watchdog timeout occurs. Some people chose a high "period"
> > value for the timer and get confused as to why the board resets within a
> > few seconds.
> >
> > Messages displayed during open and close are now debug messages, so that they
> > don't clutter the console by default. Finally, printk() is replaced with the
> > pr_xxx() equivalent.
> >
> > Signed-off-by: Timur Tabi <timur@freescale.com>
> > ---
> > drivers/watchdog/booke_wdt.c | 19 +++++++++----------
> > 1 files changed, 9 insertions(+), 10 deletions(-)
>
> applied
>
> - k
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] [v2] watchdog: booke_wdt: clean up status messages
2011-03-15 18:19 ` Wim Van Sebroeck
@ 2011-03-15 18:47 ` Kumar Gala
0 siblings, 0 replies; 4+ messages in thread
From: Kumar Gala @ 2011-03-15 18:47 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-watchdog, Timur Tabi, linuxppc-dev
On Mar 15, 2011, at 1:19 PM, Wim Van Sebroeck wrote:
> Hi Kumar,
>=20
> I allready had it in the watchdog tree for a couple of weeks (and thus =
also in linux-next).
> Are you going to sent it of to Linus or will I sent it over via the =
watchdog tree?
>=20
> Thanks in advance,
> Wim.
I'll drop it from my tree.
- k=
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-15 18:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-08 23:39 [PATCH] [v2] watchdog: booke_wdt: clean up status messages Timur Tabi
2011-03-15 15:42 ` Kumar Gala
2011-03-15 18:19 ` Wim Van Sebroeck
2011-03-15 18:47 ` Kumar Gala
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).