diff options
-rw-r--r-- | drivers/net/e1000e/hw.h | 2 | ||||
-rw-r--r-- | drivers/net/e1000e/netdev.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index 848217a38259..aa82f1afb7fb 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h | |||
@@ -852,7 +852,7 @@ struct e1000_hw { | |||
852 | 852 | ||
853 | #ifdef DEBUG | 853 | #ifdef DEBUG |
854 | #define hw_dbg(hw, format, arg...) \ | 854 | #define hw_dbg(hw, format, arg...) \ |
855 | printk(KERN_DEBUG, "%s: " format, e1000_get_hw_dev_name(hw), ##arg); | 855 | printk(KERN_DEBUG, "%s: " format, e1000e_get_hw_dev_name(hw), ##arg); |
856 | #else | 856 | #else |
857 | static inline int __attribute__ ((format (printf, 2, 3))) | 857 | static inline int __attribute__ ((format (printf, 2, 3))) |
858 | hw_dbg(struct e1000_hw *hw, const char *format, ...) | 858 | hw_dbg(struct e1000_hw *hw, const char *format, ...) |
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 4a21d7df1743..3a0bb2afe387 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -66,9 +66,7 @@ static const struct e1000_info *e1000_info_tbl[] = { | |||
66 | **/ | 66 | **/ |
67 | char *e1000e_get_hw_dev_name(struct e1000_hw *hw) | 67 | char *e1000e_get_hw_dev_name(struct e1000_hw *hw) |
68 | { | 68 | { |
69 | struct e1000_adapter *adapter = hw->back; | 69 | return hw->adapter->netdev->name; |
70 | struct net_device *netdev = adapter->netdev; | ||
71 | return netdev->name; | ||
72 | } | 70 | } |
73 | #endif | 71 | #endif |
74 | 72 | ||