diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2011-11-04 22:29:14 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-27 00:10:48 +0000 |
| commit | 5f3f9d6c441faa323444b2f6b092d630fcd7d04c (patch) | |
| tree | df8f27bfc7cccad5d2e08b3b6d513b7a5f8eb3b0 /drivers/net/ethernet/sfc/mtd.c | |
| parent | 30b81cda9516878906b44fed16aac9df1dbb89c7 (diff) | |
| download | lwn-5f3f9d6c441faa323444b2f6b092d630fcd7d04c.tar.gz lwn-5f3f9d6c441faa323444b2f6b092d630fcd7d04c.zip | |
sfc: Consistently test DEBUG macro, not EFX_ENABLE_DEBUG
The netif_dbg() macro is defined in <linux/netdevice.h>. If the DEBUG
macro is defined, it logs a message at 'debug' level, otherwise it
does nothing.
In net_driver.h we define DEBUG if EFX_ENABLE_DEBUG is defined, but
this is too late for those source files that already got a
definition of netif_dbg() by including <linux/netdevice.h>
Get rid of EFX_ENABLE_DEBUG, and only define and test DEBUG.
In mtd.c, we do not use DEBUG as a condition flag but are forced to
use the DEBUG macro-function from <linux/mtd/mtd.h>. Undefine DEBUG
before including it.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/mtd.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/mtd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c index 7f61cd3812d9..b702862a0924 100644 --- a/drivers/net/ethernet/sfc/mtd.c +++ b/drivers/net/ethernet/sfc/mtd.c @@ -10,6 +10,7 @@ #include <linux/bitops.h> #include <linux/module.h> +#undef DEBUG /* <linux/mtd/mtd.h> has its own use for DEBUG */ #include <linux/mtd/mtd.h> #include <linux/delay.h> #include <linux/slab.h> |