drivers/net/e1000/: possible cleanups
PATCH 1/1 drivers/net/e1000/: possible cleanups
This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 the following unised functions:
- e1000_hw.c: e1000_mc_addr_list_update
- e1000_hw.c: e1000_read_reg_io
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/net/e1000/e1000_ethtool.c | 2 - drivers/net/e1000/e1000_hw.c | 51 +++++++++++++++++++++--------- drivers/net/e1000/e1000_hw.h | 21 ------------ drivers/net/e1000/e1000_main.c | 6 +-- 4 files changed, 41 insertions(+), 39 deletions(-)
drivers/net/e1000/e1000_ethtool.c renamed from drivers/net/e1000/e1000_ethtool.c.old +1 -1
@@ -1629,7 +1629,7 @@ } } -struct ethtool_ops e1000_ethtool_ops = { +static struct ethtool_ops e1000_ethtool_ops = { .get_settings = e1000_get_settings, .set_settings = e1000_set_settings, .get_drvinfo = e1000_get_drvinfo,
drivers/net/e1000/e1000_hw.h renamed from drivers/net/e1000/e1000_hw.h.old +0 -21
@@ -266,10 +266,8 @@int32_t e1000_setup_link (struct e1000_hw *hw);int32_t e1000_phy_setup_autoneg (struct e1000_hw *hw);void e1000_config_collision_dist (struct e1000_hw *hw); -int32_t e1000_config_fc_after_link_up (struct e1000_hw *hw);int32_t e1000_check_for_link (struct e1000_hw *hw);int32_t e1000_get_speed_and_duplex (struct e1000_hw *hw,uint16_t * speed,uint16_t * duplex); -int32_t e1000_wait_autoneg (struct e1000_hw *hw);int32_t e1000_force_mac_fc (struct e1000_hw *hw);/* PHY */
@@ -277,13 +275,7 @@int32_t e1000_write_phy_reg (struct e1000_hw *hw,uint32_t reg_addr,uint16_t data);void e1000_phy_hw_reset (struct e1000_hw *hw);int32_t e1000_phy_reset (struct e1000_hw *hw); -int32_t e1000_detect_gig_phy (struct e1000_hw *hw);int32_t e1000_phy_get_info (struct e1000_hw *hw,struct e1000_phy_info *phy_info); -int32_t e1000_phy_m88_get_info (struct e1000_hw *hw,struct e1000_phy_info *phy_info); -int32_t e1000_phy_igp_get_info (struct e1000_hw *hw,struct e1000_phy_info *phy_info); -int32_t e1000_get_cable_length (struct e1000_hw *hw,uint16_t *min_length,uint16_t *max_length); -int32_t e1000_check_polarity (struct e1000_hw *hw,uint16_t *polarity); -int32_t e1000_check_downshift (struct e1000_hw *hw);int32_t e1000_validate_mdi_setting (struct e1000_hw *hw);/* EEPROM Functions */
@@ -296,13 +288,10 @@int32_t e1000_read_mac_addr (struct e1000_hw * hw);/* Filters (multicast, vlan, receive) */ -void e1000_init_rx_addrs (struct e1000_hw *hw); -void e1000_mc_addr_list_update (struct e1000_hw *hw,uint8_t * mc_addr_list,uint32_t mc_addr_count,uint32_t pad,uint32_t rar_used_count);uint32_t e1000_hash_mc_addr (struct e1000_hw *hw,uint8_t * mc_addr);void e1000_mta_set (struct e1000_hw *hw,uint32_t hash_value);void e1000_rar_set (struct e1000_hw *hw,uint8_t * mc_addr,uint32_t rar_index);void e1000_write_vfta (struct e1000_hw *hw,uint32_t offset,uint32_t value); -void e1000_clear_vfta (struct e1000_hw *hw);/* LED functions */ int32_t e1000_setup_led (struct e1000_hw *hw);
@@ -314,7 +303,6 @@/* Everything else */ uint32_t e1000_enable_mng_pass_thru (struct e1000_hw *hw); -void e1000_clear_hw_cntrs (struct e1000_hw *hw);void e1000_reset_adaptive (struct e1000_hw *hw);void e1000_update_adaptive (struct e1000_hw *hw);void e1000_tbi_adjust_stats (struct e1000_hw *hw,struct e1000_hw_stats *stats,uint32_t frame_len,uint8_t * mac_addr);
@@ -325,16 +313,7 @@void e1000_write_pci_cfg (struct e1000_hw *hw,uint32_t reg,uint16_t * value);/* Port I/O is only supported on 82544 and newer */ uint32_t e1000_io_read (struct e1000_hw *hw,unsigned long port); -uint32_t e1000_read_reg_io (struct e1000_hw *hw,uint32_t offset);void e1000_io_write (struct e1000_hw *hw,unsigned long port,uint32_t value); -void e1000_write_reg_io (struct e1000_hw *hw,uint32_t offset,uint32_t value); -int32_t e1000_config_dsp_after_link_change (struct e1000_hw *hw,boolean_t link_up); -int32_t e1000_set_d3_lplu_state (struct e1000_hw *hw,boolean_t active); - -#define E1000_READ_REG_IO (a, reg) \ - e1000_read_reg_io((a), E1000_##reg) -#define E1000_WRITE_REG_IO (a, reg, val) \ - e1000_write_reg_io((a), E1000_##reg, val)/* PCI Device IDs */ #define E1000_DEV_ID_82542 0x1000
drivers/net/e1000/e1000_hw.c renamed from drivers/net/e1000/e1000_hw.c.old +37 -14
165 lines not on this page · raw message
drivers/net/e1000/e1000_main.c renamed from drivers/net/e1000/e1000_main.c.old +3 -3
@@ -51,14 +51,14 @@*/ char e1000_driver_name[] ="e1000" ; -char e1000_driver_string[] ="Intel(R) PRO/1000 Network Driver" ; +static char e1000_driver_string[] ="Intel(R) PRO/1000 Network Driver" ;#ifndef CONFIG_E1000_NAPI #define DRIVERNAPI #else #define DRIVERNAPI "-NAPI"#endif char e1000_driver_version[] ="5.6.10.1-k2" DRIVERNAPI ; -char e1000_copyright[] ="Copyright (c) 1999-2004 Intel Corporation." ; +static char e1000_copyright[] ="Copyright (c) 1999-2004 Intel Corporation." ;/* e1000_pci_tbl - PCI Device ID Table *
@@ -176,7 +176,7 @@static void e1000_netpoll (struct net_device *netdev);#endif -struct notifier_block e1000_notifier_reboot = { +static struct notifier_block e1000_notifier_reboot = { .notifier_call = e1000_notify_reboot, .next =NULL , .priority =0