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>

diff --git a/drivers/net/ethernet/intel/ixgb/ixgb.h b/drivers/net/ethernet/intel/ixgb/ixgb.h
index cb23448fe2faec9948959968119369dd4af546f8..4d2ae97ff1b3d7380de5c2ea4653f33fda330880 100644 (file)
--- a/drivers/net/ethernet/intel/ixgb/ixgb.h
+++ b/drivers/net/ethernet/intel/ixgb/ixgb.h
@@ -75,18 +75,6 @@ struct ixgb_adapter;
 #include "ixgb_ee.h"
 #include "ixgb_ids.h"
 
-#define PFX "ixgb: "
-
-#ifdef _DEBUG_DRIVER_
-#define IXGB_DBG(fmt, args...) printk(KERN_DEBUG PFX fmt, ##args)
-#else
-#define IXGB_DBG(fmt, args...)                         \
-do {                                                   \
-       if (0)                                          \
-               printk(KERN_DEBUG PFX fmt, ##args);     \
-} while (0)
-#endif
-
 /* TX/RX descriptor defines */
 #define DEFAULT_TXD      256
 #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 002478801a1b655fd3508c05c967ea312838b55b..82aaa792cbf3a1472b50b623580e14e7eda5ecc6 100644 (file)
--- 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)
 
                        /* All receives must fit into a single buffer */
 
-                       IXGB_DBG("Receive packet consumed multiple buffers "
-                                        "length<%x>\n", length);
+                       pr_debug("Receive packet consumed multiple buffers length<%x>\n",
+                                length);
 
                        dev_kfree_skb_irq(skb);
                        goto rxdesc_done;