* [PATCH] drivers/net/r8169.c - trivial - add KERN_DEBUG to dprintk and PFX before KERN_ uses
@ 2007-10-02 16:37 Joe Perches
2007-10-02 16:57 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Joe Perches @ 2007-10-02 16:37 UTC (permalink / raw)
To: Francois Romieu; +Cc: Andrew Morton, David S. Miller, Jeff Garzik, netdev
Signed-off-by: Joe Perches <joe@perches.com>
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index c921ec3..40019aa 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -44,7 +44,8 @@
printk( "Assertion failed! %s,%s,%s,line=%d\n", \
#expr,__FILE__,__FUNCTION__,__LINE__); \
}
-#define dprintk(fmt, args...) do { printk(PFX fmt, ## args); } while (0)
+#define dprintk(fmt, args...) \
+ do { printk(KERN_DEBUG PFX fmt, ## args); } while (0)
#else
#define assert(expr) do {} while (0)
#define dprintk(fmt, args...) do {} while (0)
@@ -1924,7 +1925,7 @@ static void rtl_hw_start_8169(struct net_device *dev)
if ((tp->mac_version == RTL_GIGA_MAC_VER_02) ||
(tp->mac_version == RTL_GIGA_MAC_VER_03)) {
- dprintk(KERN_INFO PFX "Set MAC Reg C+CR Offset 0xE0. "
+ dprintk("Set MAC Reg C+CR Offset 0xE0. "
"Bit-3 and bit-14 MUST be 1\n");
tp->cp_cmd |= (1 << 14);
}
@@ -2289,7 +2290,7 @@ static void rtl8169_reinit_task(struct work_struct *work)
ret = rtl8169_open(dev);
if (unlikely(ret < 0)) {
if (net_ratelimit() && netif_msg_drv(tp)) {
- printk(PFX KERN_ERR "%s: reinit failure (status = %d)."
+ printk(KERN_ERR PFX "%s: reinit failure (status = %d)."
" Rescheduling.\n", dev->name, ret);
}
rtl8169_schedule_work(dev, rtl8169_reinit_task);
@@ -2321,7 +2322,7 @@ static void rtl8169_reset_task(struct work_struct *work)
netif_wake_queue(dev);
} else {
if (net_ratelimit() && netif_msg_intr(tp)) {
- printk(PFX KERN_EMERG "%s: Rx buffers shortage\n",
+ printk(KERN_EMERG PFX "%s: Rx buffers shortage\n",
dev->name);
}
rtl8169_schedule_work(dev, rtl8169_reset_task);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drivers/net/r8169.c - trivial - add KERN_DEBUG to dprintk and PFX before KERN_ uses
2007-10-02 16:37 [PATCH] drivers/net/r8169.c - trivial - add KERN_DEBUG to dprintk and PFX before KERN_ uses Joe Perches
@ 2007-10-02 16:57 ` Jeff Garzik
2007-10-02 17:06 ` Joe Perches
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2007-10-02 16:57 UTC (permalink / raw)
To: Joe Perches; +Cc: Francois Romieu, Andrew Morton, David S. Miller, netdev
Joe Perches wrote:
> Signed-off-by: Joe Perches <joe@perches.com>
>
> diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
> index c921ec3..40019aa 100644
> --- a/drivers/net/r8169.c
> +++ b/drivers/net/r8169.c
> @@ -44,7 +44,8 @@
> printk( "Assertion failed! %s,%s,%s,line=%d\n", \
> #expr,__FILE__,__FUNCTION__,__LINE__); \
> }
> -#define dprintk(fmt, args...) do { printk(PFX fmt, ## args); } while (0)
> +#define dprintk(fmt, args...) \
> + do { printk(KERN_DEBUG PFX fmt, ## args); } while (0)
> #else
> #define assert(expr) do {} while (0)
> #define dprintk(fmt, args...) do {} while (0)
> @@ -1924,7 +1925,7 @@ static void rtl_hw_start_8169(struct net_device *dev)
>
> if ((tp->mac_version == RTL_GIGA_MAC_VER_02) ||
> (tp->mac_version == RTL_GIGA_MAC_VER_03)) {
> - dprintk(KERN_INFO PFX "Set MAC Reg C+CR Offset 0xE0. "
> + dprintk("Set MAC Reg C+CR Offset 0xE0. "
> "Bit-3 and bit-14 MUST be 1\n");
> tp->cp_cmd |= (1 << 14);
> }
NAK these, the author clearly prefers his debugging output at KERN_INFO
level
> @@ -2289,7 +2290,7 @@ static void rtl8169_reinit_task(struct work_struct *work)
> ret = rtl8169_open(dev);
> if (unlikely(ret < 0)) {
> if (net_ratelimit() && netif_msg_drv(tp)) {
> - printk(PFX KERN_ERR "%s: reinit failure (status = %d)."
> + printk(KERN_ERR PFX "%s: reinit failure (status = %d)."
> " Rescheduling.\n", dev->name, ret);
> }
> rtl8169_schedule_work(dev, rtl8169_reinit_task);
> @@ -2321,7 +2322,7 @@ static void rtl8169_reset_task(struct work_struct *work)
> netif_wake_queue(dev);
> } else {
> if (net_ratelimit() && netif_msg_intr(tp)) {
> - printk(PFX KERN_EMERG "%s: Rx buffers shortage\n",
> + printk(KERN_EMERG PFX "%s: Rx buffers shortage\n",
> dev->name);
> }
these are fixes, and should be in a separate patch
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drivers/net/r8169.c - trivial - add KERN_DEBUG to dprintk and PFX before KERN_ uses
2007-10-02 16:57 ` Jeff Garzik
@ 2007-10-02 17:06 ` Joe Perches
0 siblings, 0 replies; 3+ messages in thread
From: Joe Perches @ 2007-10-02 17:06 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Francois Romieu, Andrew Morton, David S. Miller, netdev
On Tue, 2007-10-02 at 12:57 -0400, Jeff Garzik wrote:
> \> @@ -1924,7 +1925,7 @@ static void rtl_hw_start_8169(struct net_device *dev)
> >
> > if ((tp->mac_version == RTL_GIGA_MAC_VER_02) ||
> > (tp->mac_version == RTL_GIGA_MAC_VER_03)) {
> > - dprintk(KERN_INFO PFX "Set MAC Reg C+CR Offset 0xE0. "
> > + dprintk("Set MAC Reg C+CR Offset 0xE0. "
> > "Bit-3 and bit-14 MUST be 1\n");
> > tp->cp_cmd |= (1 << 14);
> > }
>
> NAK these, the author clearly prefers his debugging output at KERN_INFO
> level
This fixes an expanded printk(PFX KERN_INFO PFX foo) bug.
That the author "clearly prefers" is dubious.
The rest of the dprintk uses are undefined.
$ grep dprintk drivers/net/r8169.c
dprintk("mac_version = 0x%02x\n", tp->mac_version);
dprintk("phy_version == %s (%04x)\n", p->msg, p->reg);
dprintk("phy_version == Unknown\n");
dprintk("MAC version != 0 && PHY version == 0 or 1\n");
dprintk("Do final_reg2.cfg\n");
dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
dprintk("Set PHY Reg 0x0bh = 0x00h\n");
dprintk(KERN_INFO PFX "Set MAC Reg C+CR Offset 0xE0. "
If the author does so prefer KERN_INFO levels, it's better to use:
#define dprintk(fmt, arg...) \
do { printk(KERN_INFO PFX fmt, ## arg); } while (0)
cheers, Joe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-02 17:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-02 16:37 [PATCH] drivers/net/r8169.c - trivial - add KERN_DEBUG to dprintk and PFX before KERN_ uses Joe Perches
2007-10-02 16:57 ` Jeff Garzik
2007-10-02 17:06 ` Joe Perches
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).