diff options
author | Don Skidmore <donald.c.skidmore@intel.com> | 2011-01-27 21:28:31 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-02-11 11:56:39 -0500 |
commit | 32f754667e66870773e40116687b6849963152f5 (patch) | |
tree | e5646b7a6cc914a6ce337a1dca41cd794164d63b /drivers/net/ixgbe | |
parent | 3b2ee94300277220452332d2ebadf5b5699947b5 (diff) |
ixgbe: cleanup namespace complaint by removing little used function
We had a support function that just walked a few pointers to get
from the ixgbe_hw struct to the netdev pointer. This was causing
a namespace warning so I removed it and just reference the pointers
directly.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_common.h | 4 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h index 66ed045a8cf0..90cceb4a6317 100644 --- a/drivers/net/ixgbe/ixgbe_common.h +++ b/drivers/net/ixgbe/ixgbe_common.h | |||
@@ -29,6 +29,7 @@ | |||
29 | #define _IXGBE_COMMON_H_ | 29 | #define _IXGBE_COMMON_H_ |
30 | 30 | ||
31 | #include "ixgbe_type.h" | 31 | #include "ixgbe_type.h" |
32 | #include "ixgbe.h" | ||
32 | 33 | ||
33 | u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw); | 34 | u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw); |
34 | s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw); | 35 | s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw); |
@@ -110,9 +111,8 @@ void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf); | |||
110 | 111 | ||
111 | #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS) | 112 | #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS) |
112 | 113 | ||
113 | extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw); | ||
114 | #define hw_dbg(hw, format, arg...) \ | 114 | #define hw_dbg(hw, format, arg...) \ |
115 | netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg) | 115 | netdev_dbg(((struct ixgbe_adapter *)(hw->back))->netdev, format, ##arg) |
116 | #define e_dev_info(format, arg...) \ | 116 | #define e_dev_info(format, arg...) \ |
117 | dev_info(&adapter->pdev->dev, format, ## arg) | 117 | dev_info(&adapter->pdev->dev, format, ## arg) |
118 | #define e_dev_warn(format, arg...) \ | 118 | #define e_dev_warn(format, arg...) \ |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 34fdda21dba3..4a6bcb66d2a8 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -7707,16 +7707,6 @@ static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event, | |||
7707 | 7707 | ||
7708 | #endif /* CONFIG_IXGBE_DCA */ | 7708 | #endif /* CONFIG_IXGBE_DCA */ |
7709 | 7709 | ||
7710 | /** | ||
7711 | * ixgbe_get_hw_dev return device | ||
7712 | * used by hardware layer to print debugging information | ||
7713 | **/ | ||
7714 | struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw) | ||
7715 | { | ||
7716 | struct ixgbe_adapter *adapter = hw->back; | ||
7717 | return adapter->netdev; | ||
7718 | } | ||
7719 | |||
7720 | module_exit(ixgbe_exit_module); | 7710 | module_exit(ixgbe_exit_module); |
7721 | 7711 | ||
7722 | /* ixgbe_main.c */ | 7712 | /* ixgbe_main.c */ |