igbvf: remove unused fields from struct igbvf_adapter
Subsystems (3)
PATCH 1/1 igbvf: remove unused fields from struct igbvf_adapter
Remove following unused fields from struct igbvf_adapter that are never referenced in the driver.
- blink_timer
- eeprom_wol
- fc_autoneg
- int_mode
- led_status
- mng_vlan_id
- polling_interval
- rx_dma_failed
- test_icr
- test_rx_ring
- test_tx_ring
- tx_dma_failed
- tx_fifo_head
- tx_fifo_size
- tx_head_addr
Also removed the following fields from struct igbvf_adapter since they are never read or used after initialization by igbvf_probe() and igbvf_sw_init().
- bd_number
- rx_abs_int_delay
- tx_abs_int_delay
- rx_int_delay
- tx_int_delay
This changes simplify the igbvf driver by removing unused fields, which improves maintenability.
--- drivers/net/ethernet/intel/igbvf/igbvf.h | 25 ----------------------- drivers/net/ethernet/intel/igbvf/netdev.c | 7 ------- 2 files changed, 32 deletions(-)
drivers/net/ethernet/intel/igbvf/igbvf.h +0 -25
@@ -154,7 +154,6 @@ struct igbvf_ring {/* board specific private data structure */ struct igbvf_adapter {struct timer_list watchdog_timer; -struct timer_list blink_timer;struct work_struct reset_task;struct work_struct watchdog_task;
@@ -162,10 +161,7 @@ struct igbvf_adapter {const struct igbvf_info *ei;unsigned long active_vlans[BITS_TO_LONGS (VLAN_N_VID )]; -u32 bd_number;u32 rx_buffer_len; -u32 polling_interval; -u16 mng_vlan_id;u16 link_speed;u16 link_duplex;
@@ -183,9 +179,6 @@ struct igbvf_adapter {unsigned int restart_queue;u32 txd_cmd; -u32 tx_int_delay; -u32 tx_abs_int_delay; -unsigned int total_tx_bytes;unsigned int total_tx_packets;unsigned int total_rx_bytes;
@@ -193,23 +186,15 @@ struct igbvf_adapter {/* Tx stats */ u32 tx_timeout_count; -u32 tx_fifo_head; -u32 tx_head_addr; -u32 tx_fifo_size; -u32 tx_dma_failed;/* Rx */ struct igbvf_ring *rx_ring; -u32 rx_int_delay; -u32 rx_abs_int_delay; -/* Rx stats */ u64 hw_csum_err;u64 hw_csum_good;u64 rx_hdr_split;u32 alloc_rx_buff_failed; -u32 rx_dma_failed;unsigned int rx_ps_hdr_size;u32 max_frame_size;
@@ -229,26 +214,16 @@ struct igbvf_adapter {struct e1000_vf_stats stats;u64 zero_base; -struct igbvf_ring test_tx_ring; -struct igbvf_ring test_rx_ring; -u32 test_icr; -u32 msg_enable;struct msix_entry *msix_entries; -int int_mode;u32 eims_enable_mask;u32 eims_other;u32 int_counter0;u32 int_counter1; -u32 eeprom_wol;u32 wol;u32 pba; -bool fc_autoneg; - -unsigned long led_status; -unsigned int flags;unsigned long last_reset; };
drivers/net/ethernet/intel/igbvf/netdev.c +0 -7
@@ -1633,10 +1633,6 @@ static int igbvf_sw_init(struct igbvf_adapter *adapter) adapter->max_frame_size = netdev->mtu +ETH_HLEN +ETH_FCS_LEN ; adapter->min_frame_size =ETH_ZLEN +ETH_FCS_LEN ; - adapter->tx_int_delay =8 ; - adapter->tx_abs_int_delay =32 ; - adapter->rx_int_delay =0 ; - adapter->rx_abs_int_delay =8 ; adapter->requested_itr =3 ; adapter->current_itr =IGBVF_START_ITR ;
@@ -2712,7 +2708,6 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)struct igbvf_adapter *adapter;struct e1000_hw *hw;const struct igbvf_info *ei = igbvf_info_tbl[ent->driver_data]; -static int cards_found;int err; err =pci_enable_device_mem (pdev);
@@ -2784,8 +2779,6 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->watchdog_timeo =5 *HZ ;strscpy (netdev->name,pci_name (pdev),sizeof (netdev->name)); - adapter->bd_number = cards_found++; - netdev->hw_features =NETIF_F_SG |NETIF_F_TSO | NETIF_F_TSO6 |
Signature · 8 lines
2.47.1 Amazon Web Services EMEA SARL, 38 avenue John F. Kennedy, L-1855 Luxembourg, R.C.S. Luxembourg B186284 Amazon Web Services EMEA SARL, Irish Branch, One Burlington Plaza, Burlington Road, Dublin 4, Ireland, branch registration number 908705
Quoted 31 lines · Yuto Ohnuki
Remove following unused fields from struct
igbvf_adapterthat are never referenced in the driver.-
blink_timer
-eeprom_wol
-fc_autoneg
-int_mode
-led_status
-mng_vlan_id
-polling_interval
-rx_dma_failed
-test_icr
-test_rx_ring
-test_tx_ring
-tx_dma_failed
-tx_fifo_head
-tx_fifo_size
-tx_head_addrAlso removed the following fields from struct
igbvf_adaptersince they are never read or used after initialization byigbvf_probe()andigbvf_sw_init().-
bd_number
-rx_abs_int_delay
-tx_abs_int_delay
-rx_int_delay
-tx_int_delayThis changes simplify the igbvf driver by removing unused fields, which improves maintenability.
Quoted 6 lines
Tested-by Kohei Enju <[email protected]>Signed-off-by Yuto Ohnuki <[email protected]>--- drivers/net/ethernet/intel/igbvf/igbvf.h | 25 ----------------------- drivers/net/ethernet/intel/igbvf/netdev.c | 7 ------- 2 files changed, 32 deletions(-)
Less is more :)