2006-10-10 12:01:13

by Robert P. J. Day

Subject: [PATCH] ixgb: Delete IXGB_DBG() macro and call pr_debug() directly.

Remove the minimally-useful definition of IXGB_DBG() and have
ixgb_main.c call pr_debug() directly.

Signed-off-by: Robert P. J. Day <[email protected]>
---
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index 50ffe90..fb9fde5 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -77,12 +77,6 @@ #include "ixgb_hw.h"
#include "ixgb_ee.h"
#include "ixgb_ids.h"

-#ifdef _DEBUG_DRIVER_
-#define IXGB_DBG(args...) printk(KERN_DEBUG "ixgb: " args)
-#else
-#define IXGB_DBG(args...)
-#endif
-
#define PFX "ixgb: "
#define DPRINTK(nlevel, klevel, fmt, args...) \
(void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index e09f575..d063e84 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1948,7 +1948,7 @@ #endif

/* All receives must fit into a single buffer */

- IXGB_DBG("Receive packet consumed multiple buffers "
+ pr_debug("Receive packet consumed multiple buffers "
"length<%x>\n", length);

dev_kfree_skb_irq(skb);

--

ok, one more time ...

rday

2006-10-10 12:12:49

by Andreas Schwab

Subject: Re: [PATCH] ixgb: Delete IXGB_DBG() macro and call pr_debug() directly.

"Robert P. J. Day" <[email protected]> writes:

> Remove the minimally-useful definition of IXGB_DBG() and have
> ixgb_main.c call pr_debug() directly.
>
> Signed-off-by: Robert P. J. Day <[email protected]>
> ---
> diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
> index 50ffe90..fb9fde5 100644
> --- a/drivers/net/ixgb/ixgb.h
> +++ b/drivers/net/ixgb/ixgb.h
> @@ -77,12 +77,6 @@ #include "ixgb_hw.h"
> #include "ixgb_ee.h"
> #include "ixgb_ids.h"
>
> -#ifdef _DEBUG_DRIVER_
> -#define IXGB_DBG(args...) printk(KERN_DEBUG "ixgb: " args)
^^^^^^^^
> -#else
> -#define IXGB_DBG(args...)
> -#endif
> -
> #define PFX "ixgb: "
> #define DPRINTK(nlevel, klevel, fmt, args...) \
> (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
> diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
> index e09f575..d063e84 100644
> --- a/drivers/net/ixgb/ixgb_main.c
> +++ b/drivers/net/ixgb/ixgb_main.c
> @@ -1948,7 +1948,7 @@ #endif
>
> /* All receives must fit into a single buffer */
>
> - IXGB_DBG("Receive packet consumed multiple buffers "
> + pr_debug("Receive packet consumed multiple buffers "

Would perhaps be useful to retain the "ixgb:" prefix.

Andreas.

--
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux Products GmbH, Maxfeldstra?e 5, 90409 N?rnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."

2006-10-10 12:17:01

by Robert P. J. Day

Subject: Re: [PATCH] ixgb: Delete IXGB_DBG() macro and call pr_debug() directly.

On Tue, 10 Oct 2006, Andreas Schwab wrote:

> "Robert P. J. Day" <[email protected]> writes:
>
> > Remove the minimally-useful definition of IXGB_DBG() and have
> > ixgb_main.c call pr_debug() directly.
> >
> > Signed-off-by: Robert P. J. Day <[email protected]>
> > ---
> > diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
> > index 50ffe90..fb9fde5 100644
> > --- a/drivers/net/ixgb/ixgb.h
> > +++ b/drivers/net/ixgb/ixgb.h
> > @@ -77,12 +77,6 @@ #include "ixgb_hw.h"
> > #include "ixgb_ee.h"
> > #include "ixgb_ids.h"
> >
> > -#ifdef _DEBUG_DRIVER_
> > -#define IXGB_DBG(args...) printk(KERN_DEBUG "ixgb: " args)
> ^^^^^^^^
> > -#else
> > -#define IXGB_DBG(args...)
> > -#endif
> > -
> > #define PFX "ixgb: "
> > #define DPRINTK(nlevel, klevel, fmt, args...) \
> > (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
> > diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
> > index e09f575..d063e84 100644
> > --- a/drivers/net/ixgb/ixgb_main.c
> > +++ b/drivers/net/ixgb/ixgb_main.c
> > @@ -1948,7 +1948,7 @@ #endif
> >
> > /* All receives must fit into a single buffer */
> >
> > - IXGB_DBG("Receive packet consumed multiple buffers "
> > + pr_debug("Receive packet consumed multiple buffers "
>
> Would perhaps be useful to retain the "ixgb:" prefix.

crap, you're right. my bad. back into the breech ... argh. that's
what happens when there's only decaf left in the house.

rday