From 9d712b9480189dd4e20bef8d032207037596619c Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 4 Nov 2011 22:29:14 +0000
Subject: [PATCH] --- yaml --- r: 289798 b: refs/heads/master c:
 5f3f9d6c441faa323444b2f6b092d630fcd7d04c h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/ethernet/sfc/mtd.c        | 1 +
 trunk/drivers/net/ethernet/sfc/net_driver.h | 6 +-----
 trunk/drivers/net/ethernet/sfc/nic.c        | 2 +-
 trunk/drivers/net/ethernet/sfc/selftest.c   | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3e59a39054fa..8a4684765089 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30b81cda9516878906b44fed16aac9df1dbb89c7
+refs/heads/master: 5f3f9d6c441faa323444b2f6b092d630fcd7d04c
diff --git a/trunk/drivers/net/ethernet/sfc/mtd.c b/trunk/drivers/net/ethernet/sfc/mtd.c
index 7f61cd3812d9..b702862a0924 100644
--- a/trunk/drivers/net/ethernet/sfc/mtd.c
+++ b/trunk/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>
diff --git a/trunk/drivers/net/ethernet/sfc/net_driver.h b/trunk/drivers/net/ethernet/sfc/net_driver.h
index a88e95f58b0a..4cbd997e378b 100644
--- a/trunk/drivers/net/ethernet/sfc/net_driver.h
+++ b/trunk/drivers/net/ethernet/sfc/net_driver.h
@@ -13,10 +13,6 @@
 #ifndef EFX_NET_DRIVER_H
 #define EFX_NET_DRIVER_H
 
-#if defined(EFX_ENABLE_DEBUG) && !defined(DEBUG)
-#define DEBUG
-#endif
-
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -42,7 +38,7 @@
 
 #define EFX_DRIVER_VERSION	"3.1"
 
-#ifdef EFX_ENABLE_DEBUG
+#ifdef DEBUG
 #define EFX_BUG_ON_PARANOID(x) BUG_ON(x)
 #define EFX_WARN_ON_PARANOID(x) WARN_ON(x)
 #else
diff --git a/trunk/drivers/net/ethernet/sfc/nic.c b/trunk/drivers/net/ethernet/sfc/nic.c
index b1df2f39c8f0..bf07bd0488cf 100644
--- a/trunk/drivers/net/ethernet/sfc/nic.c
+++ b/trunk/drivers/net/ethernet/sfc/nic.c
@@ -801,7 +801,7 @@ static void efx_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
 	 * error message.  FRM_TRUNC indicates RXDP dropped the packet due
 	 * to a FIFO overflow.
 	 */
-#ifdef EFX_ENABLE_DEBUG
+#ifdef DEBUG
 	if (rx_ev_other_err && net_ratelimit()) {
 		netif_dbg(efx, rx_err, efx->net_dev,
 			  " RX queue %d unexpected RX event "
diff --git a/trunk/drivers/net/ethernet/sfc/selftest.c b/trunk/drivers/net/ethernet/sfc/selftest.c
index 9df2a7942509..7718287ad0bc 100644
--- a/trunk/drivers/net/ethernet/sfc/selftest.c
+++ b/trunk/drivers/net/ethernet/sfc/selftest.c
@@ -315,7 +315,7 @@ void efx_loopback_rx_packet(struct efx_nic *efx,
 	return;
 
  err:
-#ifdef EFX_ENABLE_DEBUG
+#ifdef DEBUG
 	if (atomic_read(&state->rx_bad) == 0) {
 		netif_err(efx, drv, efx->net_dev, "received packet:\n");
 		print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 0x10, 1,