drivers/net/ixgb/: possible cleanups
PATCH 1/1 drivers/net/ixgb/: possible cleanups
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global functions:
- ixgb_ee.c: ixgb_get_ee_compatibility
- ixgb_ee.c: ixgb_get_ee_init_ctrl_reg_1
- ixgb_ee.c: ixgb_get_ee_init_ctrl_reg_2
- ixgb_ee.c: ixgb_get_ee_subsystem_id
- ixgb_ee.c: ixgb_get_ee_subvendor_id
- ixgb_ee.c: ixgb_get_ee_vendor_id
- ixgb_ee.c: ixgb_get_ee_swdpins_reg
- ixgb_ee.c: ixgb_get_ee_d3_power
- ixgb_ee.c: ixgb_get_ee_d0_power
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/net/ixgb/ixgb_ee.c | 170 -------------------------------- drivers/net/ixgb/ixgb_ethtool.c | 2 drivers/net/ixgb/ixgb_hw.c | 26 +++- drivers/net/ixgb/ixgb_hw.h | 26 ---- drivers/net/ixgb/ixgb_main.c | 6 - 5 files changed, 21 insertions(+), 209 deletions(-)
drivers/net/ixgb/ixgb_hw.h renamed from drivers/net/ixgb/ixgb_hw.h.old +0 -26
@@ -784,23 +784,8 @@extern boolean_t ixgb_adapter_stop (struct ixgb_hw *hw);extern boolean_t ixgb_init_hw (struct ixgb_hw *hw);extern boolean_t ixgb_adapter_start (struct ixgb_hw *hw); -extern void ixgb_init_rx_addrs (struct ixgb_hw *hw);extern void ixgb_check_for_link (struct ixgb_hw *hw);extern boolean_t ixgb_check_for_bad_link (struct ixgb_hw *hw); -extern boolean_t ixgb_setup_fc (struct ixgb_hw *hw); -extern void ixgb_clear_hw_cntrs (struct ixgb_hw *hw); -extern boolean_t mac_addr_valid (uint8_t *mac_addr); - -extern uint16_t ixgb_read_phy_reg (struct ixgb_hw *hw, -uint32_t reg_addr, -uint32_t phy_addr, -uint32_t device_type); - -extern void ixgb_write_phy_reg (struct ixgb_hw *hw, -uint32_t reg_addr, -uint32_t phy_addr, -uint32_t device_type, -uint16_t data); extern void ixgb_rar_set(struct ixgb_hw *hw, uint8_t *addr,
@@ -818,21 +803,10 @@uint32_t offset, uint32_t value); -extern void ixgb_clear_vfta (struct ixgb_hw *hw); -/* Access functions to eeprom data */ void ixgb_get_ee_mac_addr (struct ixgb_hw *hw,uint8_t *mac_addr); -uint16_t ixgb_get_ee_compatibility (struct ixgb_hw *hw);uint32_t ixgb_get_ee_pba_number (struct ixgb_hw *hw); -uint16_t ixgb_get_ee_init_ctrl_reg_1 (struct ixgb_hw *hw); -uint16_t ixgb_get_ee_init_ctrl_reg_2 (struct ixgb_hw *hw); -uint16_t ixgb_get_ee_subsystem_id (struct ixgb_hw *hw); -uint16_t ixgb_get_ee_subvendor_id (struct ixgb_hw *hw);uint16_t ixgb_get_ee_device_id (struct ixgb_hw *hw); -uint16_t ixgb_get_ee_vendor_id (struct ixgb_hw *hw); -uint16_t ixgb_get_ee_swdpins_reg (struct ixgb_hw *hw); -uint8_t ixgb_get_ee_d3_power (struct ixgb_hw *hw); -uint8_t ixgb_get_ee_d0_power (struct ixgb_hw *hw);boolean_t ixgb_get_eeprom_data (struct ixgb_hw *hw);uint16_t ixgb_get_eeprom_word (struct ixgb_hw *hw,uint16_t index);
drivers/net/ixgb/ixgb_ee.c renamed from drivers/net/ixgb/ixgb_ee.c.old +0 -170
185 lines not on this page · raw message
drivers/net/ixgb/ixgb_ethtool.c renamed from drivers/net/ixgb/ixgb_ethtool.c.old +1 -1
@@ -665,7 +665,7 @@ } } -struct ethtool_ops ixgb_ethtool_ops = { +static struct ethtool_ops ixgb_ethtool_ops = { .get_settings = ixgb_get_settings, .set_settings = ixgb_set_settings, .get_drvinfo = ixgb_get_drvinfo,
drivers/net/ixgb/ixgb_hw.c renamed from drivers/net/ixgb/ixgb_hw.c.old +17 -9
@@ -47,9 +47,17 @@static ixgb_phy_type ixgb_identify_phy (struct ixgb_hw *hw); -uint32_t ixgb_mac_reset (struct ixgb_hw *hw); +static void ixgb_clear_hw_cntrs (struct ixgb_hw *hw); +static void ixgb_clear_vfta (struct ixgb_hw *hw); +static void ixgb_init_rx_addrs (struct ixgb_hw *hw); +static uint16_t ixgb_read_phy_reg (struct ixgb_hw *hw, +uint32_t reg_address, +uint32_t phy_address, +uint32_t device_type); +static boolean_t ixgb_setup_fc (struct ixgb_hw *hw); +static boolean_t mac_addr_valid (uint8_t *mac_addr); -uint32_t ixgb_mac_reset (struct ixgb_hw *hw) +static uint32_t ixgb_mac_reset (struct ixgb_hw *hw) {uint32_t ctrl_reg;
@@ -335,7 +343,7 @@* of the receive addresss registers. Clears the multicast table. Assumes * the receiver is in reset when the routine is called. *****************************************************************************/ -void +static void ixgb_init_rx_addrs (struct ixgb_hw *hw) {uint32_t i;
@@ -604,7 +612,7 @@* * hw - Struct containing variables accessed by shared code *****************************************************************************/ -void +static void ixgb_clear_vfta (struct ixgb_hw *hw) {uint32_t offset;
@@ -620,7 +628,7 @@* hw - Struct containing variables accessed by shared code *****************************************************************************/ -boolean_t +static boolean_t ixgb_setup_fc (struct ixgb_hw *hw) {uint32_t ctrl_reg;
@@ -722,7 +730,7 @@* This requires that first an address cycle command is sent, followed by a * read command. *****************************************************************************/ -uint16_t +static uint16_t ixgb_read_phy_reg(struct ixgb_hw *hw, uint32_t reg_address, uint32_t phy_address,
@@ -815,7 +823,7 @@* This requires that first an address cycle command is sent, followed by a * write command. *****************************************************************************/ -void +static void ixgb_write_phy_reg(struct ixgb_hw *hw, uint32_t reg_address, uint32_t phy_address,
@@ -959,7 +967,7 @@* * hw - Struct containing variables accessed by shared code *****************************************************************************/ -void +static void ixgb_clear_hw_cntrs (struct ixgb_hw *hw) {volatile uint32_t temp_reg;
@@ -1114,7 +1122,7 @@* mac_addr - pointer to MAC address. * *****************************************************************************/ -boolean_t +static boolean_t mac_addr_valid (uint8_t *mac_addr) {boolean_t is_valid = TRUE;
drivers/net/ixgb/ixgb_main.c renamed from drivers/net/ixgb/ixgb_main.c.old +3 -3
@@ -37,14 +37,14 @@*/ char ixgb_driver_name[] ="ixgb" ; -char ixgb_driver_string[] ="Intel(R) PRO/10GbE Network Driver" ; +static char ixgb_driver_string[] ="Intel(R) PRO/10GbE Network Driver" ;#ifndef CONFIG_IXGB_NAPI #define DRIVERNAPI #else #define DRIVERNAPI "-NAPI"#endif char ixgb_driver_version[] ="1.0.87-k2" DRIVERNAPI ; -char ixgb_copyright[] ="Copyright (c) 1999-2004 Intel Corporation." ; +static char ixgb_copyright[] ="Copyright (c) 1999-2004 Intel Corporation." ;/* ixgb_pci_tbl - PCI Device ID Table *
@@ -125,7 +125,7 @@static void ixgb_netpoll (struct net_device *dev);#endif -struct notifier_block ixgb_notifier_reboot = { +static struct notifier_block ixgb_notifier_reboot = { .notifier_call = ixgb_notify_reboot, .next =NULL , .priority =0