| Message ID | 29c66ee0bae26a0c352b4605e3f1fcbe0612f3a5.1254701151.git.joe@perches.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Joe Perches <joe@perches.com> Date: Sun, 4 Oct 2009 17:53:48 -0700 > Removed "TLAN: " prefix from debug printks, it's added by pr_fmt > > Signed-off-by: Joe Perches <joe@perches.com> Applied to net-next-2.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2009-10-05 at 00:12 -0700, David Miller wrote: > From: Joe Perches <joe@perches.com> > Date: Sun, 4 Oct 2009 17:53:48 -0700 > > Removed "TLAN: " prefix from debug printks, it's added by pr_fmt > > Signed-off-by: Joe Perches <joe@perches.com> > Applied to net-next-2.6 Patches 20 and 21 depend on patch 1, which introduces pr_dbg to kernel.h. Compile failure otherwise. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Joe Perches <joe@perches.com> Date: Mon, 05 Oct 2009 00:16:14 -0700 > On Mon, 2009-10-05 at 00:12 -0700, David Miller wrote: >> From: Joe Perches <joe@perches.com> >> Date: Sun, 4 Oct 2009 17:53:48 -0700 >> > Removed "TLAN: " prefix from debug printks, it's added by pr_fmt >> > Signed-off-by: Joe Perches <joe@perches.com> >> Applied to net-next-2.6 > > Patches 20 and 21 depend on patch 1, which introduces pr_dbg > to kernel.h. Compile failure otherwise. Ok, I'll toss them then. Someone else merge this stuff: Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Monday 05 October 2009, Joe Perches wrote: > On Mon, 2009-10-05 at 00:12 -0700, David Miller wrote: > > From: Joe Perches <joe@perches.com> > > Date: Sun, 4 Oct 2009 17:53:48 -0700 > > > Removed "TLAN: " prefix from debug printks, it's added by pr_fmt > > > Signed-off-by: Joe Perches <joe@perches.com> > > Applied to net-next-2.6 > > Patches 20 and 21 depend on patch 1, which introduces pr_dbg > to kernel.h. Compile failure otherwise. Why don't you push the first patch first, then, and wait with the others until it gets merged? This way individual subsystem maintainers will be able to merge them cleanly. Rafael -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2009-10-05 at 23:15 +0200, Rafael J. Wysocki wrote: > Why don't you push the first patch first, then, and wait with the others until > it gets merged? This way individual subsystem maintainers will be able to > merge them cleanly. Sometimes patch series get a bit more feedback than individual patches. Original rfc suggestion: (1 comment) http://lkml.org/lkml/2009/10/1/399 Patch removing pr_fmt from driver (acked by Jiri): http://lkml.org/lkml/2009/10/1/418 cheers, Joe -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/tlan.h b/drivers/net/tlan.h index 4b82f28..c5a4ad5 100644 --- a/drivers/net/tlan.h +++ b/drivers/net/tlan.h @@ -44,7 +44,7 @@ #define TLAN_RECORD 1 #define TLAN_DBG(lvl, format, args...) \ - do { if (debug&lvl) printk(KERN_DEBUG "TLAN: " format, ##args ); } while(0) + do { if (debug & lvl) pr_dbg(format, ##args); } while (0) #define TLAN_DEBUG_GNRL 0x0001 #define TLAN_DEBUG_TX 0x0002
Removed "TLAN: " prefix from debug printks, it's added by pr_fmt Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/tlan.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)