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.

Tested-by: Kohei Enju <enjuk@amazon.com>
Signed-off-by: Yuto Ohnuki <ytohnuki@amazon.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h
index ba9c3fee6da7acbf68b24a3c1b9ea017bc2506ce..da8e1fd47301c865ac2c5c3abde3b0be3bbd338c 100644 (file)
--- a/drivers/net/ethernet/intel/igbvf/igbvf.h
+++ b/drivers/net/ethernet/intel/igbvf/igbvf.h
@@ -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,24 +214,14 @@ 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 eeprom_wol;
        u32 wol;
        u32 pba;
 
-       bool fc_autoneg;
-
-       unsigned long led_status;
-
        unsigned int flags;
        unsigned long last_reset;
 };

diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index aed9162afd3808957c4b3ae22611a442031b740b..61dfcd8cb370a06273c53156599699a6f9083bcc 100644 (file)
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1629,10 +1629,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;
 
@@ -2708,7 +2704,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);
@@ -2780,8 +2775,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 |