summaryrefslogtreecommitdiff
path: root/drivers/net/igb/e1000_hw.h
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2010-03-25 13:10:08 (GMT)
committerDavid S. Miller <davem@davemloft.net>2010-03-31 06:02:26 (GMT)
commitc041076a9f79a7cf28e808f73cc76f24cbf97093 (patch)
tree6cd3b7fa661e7b835185f058f8c560c6f870db80 /drivers/net/igb/e1000_hw.h
parent7e5ab157813993356f021757d0b0dcbdca7c55a1 (diff)
downloadlinux-fsl-qoriq-c041076a9f79a7cf28e808f73cc76f24cbf97093.tar.xz
igb: update hw_debug macro to make use of netdev_dbg call
This change updates the igb driver to make use of the netdev_dbg function macros now provided in netdevice.h This is meant to be provided as an alternative to the patch provided by Joe Perches. It also removes igb_get_time_str since I found that it is unused code that is no longer used even in debug. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/e1000_hw.h')
-rw-r--r--drivers/net/igb/e1000_hw.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index 593d5fa..cb8db78 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -31,6 +31,7 @@
#include <linux/types.h>
#include <linux/delay.h>
#include <linux/io.h>
+#include <linux/netdevice.h>
#include "e1000_regs.h"
#include "e1000_defines.h"
@@ -507,14 +508,11 @@ struct e1000_hw {
u8 revision_id;
};
-#ifdef DEBUG
-extern char *igb_get_hw_dev_name(struct e1000_hw *hw);
+extern struct net_device *igb_get_hw_dev(struct e1000_hw *hw);
#define hw_dbg(format, arg...) \
- printk(KERN_DEBUG "%s: " format, igb_get_hw_dev_name(hw), ##arg)
-#else
-#define hw_dbg(format, arg...)
-#endif
-#endif
+ netdev_dbg(igb_get_hw_dev(hw), format, ##arg)
+
/* These functions must be implemented by drivers */
s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
+#endif /* _E1000_HW_H_ */