From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Joe Perches <joe@perches.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 1/7] ixgb: Remove unnecessary defines, use pr_debug
Date: Wed, 14 Mar 2012 00:55:20 -0700 [thread overview]
Message-ID: <1331711726-9439-2-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1331711726-9439-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Joe Perches <joe@perches.com>
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>
---
drivers/net/ethernet/intel/ixgb/ixgb.h | 12 ------------
drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 ++--
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 cb23448..4d2ae97 100644
--- 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 0024788..82aaa79 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)
/* 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;
--
1.7.7.6
next prev parent reply other threads:[~2012-03-14 7:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-14 7:55 [net-next 0/7][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-03-14 7:55 ` Jeff Kirsher [this message]
2012-03-14 7:55 ` [net-next 2/7] ixgbe: Do not disable read relaxed ordering when DCA is enabled Jeff Kirsher
2012-03-14 7:55 ` [net-next 3/7] ixgbe: Replace eitr_low and eitr_high with static values in ixgbe_update_itr Jeff Kirsher
2012-03-14 7:55 ` [net-next 4/7] ixgbe: fix obvious return value bug Jeff Kirsher
2012-03-14 7:55 ` [net-next 5/7] ixgbe: use typed min/max functions where possible Jeff Kirsher
2012-03-14 7:55 ` [net-next 6/7] ixgbe: Fix race condition where RX buffer could become corrupted Jeff Kirsher
2012-03-14 7:55 ` [net-next 7/7] ixgbe: dcb: use DCB config values for FCoE traffic class on open Jeff Kirsher
2012-03-14 9:27 ` [net-next 0/7][pull request] Intel Wired LAN Driver Updates David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331711726-9439-2-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=joe@perches.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).