aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-02-08 11:14:59 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-03-14 03:26:42 -0400
commit5edc4465826bf5be4da678822b0c0e35666b6d67 (patch)
tree080b7d7704a0090b7d3ae2549ac6b1fa8d17fc30
parent3832b26e49ad9e585239b32f763c31679f9e41fe (diff)
ixgb: Remove unnecessary defines, use pr_debug
Use the current logging styles. Remove unnecessary _DEBUG_DRIVER_ and PFX, use pr_debug. Coalesce format. Signed-off-by: Joe Perches <joe@perches.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb.h12
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_main.c4
2 files changed, 2 insertions, 14 deletions
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb.h b/drivers/net/ethernet/intel/ixgb/ixgb.h
index cb23448fe2fa..4d2ae97ff1b3 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb.h
+++ b/drivers/net/ethernet/intel/ixgb/ixgb.h
@@ -75,18 +75,6 @@ struct ixgb_adapter;
75#include "ixgb_ee.h" 75#include "ixgb_ee.h"
76#include "ixgb_ids.h" 76#include "ixgb_ids.h"
77 77
78#define PFX "ixgb: "
79
80#ifdef _DEBUG_DRIVER_
81#define IXGB_DBG(fmt, args...) printk(KERN_DEBUG PFX fmt, ##args)
82#else
83#define IXGB_DBG(fmt, args...) \
84do { \
85 if (0) \
86 printk(KERN_DEBUG PFX fmt, ##args); \
87} while (0)
88#endif
89
90/* TX/RX descriptor defines */ 78/* TX/RX descriptor defines */
91#define DEFAULT_TXD 256 79#define DEFAULT_TXD 256
92#define MAX_TXD 4096 80#define MAX_TXD 4096
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 002478801a1b..82aaa792cbf3 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -2068,8 +2068,8 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
2068 2068
2069 /* All receives must fit into a single buffer */ 2069 /* All receives must fit into a single buffer */
2070 2070
2071 IXGB_DBG("Receive packet consumed multiple buffers " 2071 pr_debug("Receive packet consumed multiple buffers length<%x>\n",
2072 "length<%x>\n", length); 2072 length);
2073 2073
2074 dev_kfree_skb_irq(skb); 2074 dev_kfree_skb_irq(skb);
2075 goto rxdesc_done; 2075 goto rxdesc_done;