RE: [PATCH net-next] qlcnic: remove set but not used variables 'cur_rings, max_hw_rings, tx_desc_info'

[Shaikh, Shahed]

> -----Original Message-----
> From: YueHaibing <yuehaibing@xxxxxxxxxx>
> Sent: Wednesday, November 28, 2018 6:00 PM
> To: davem@xxxxxxxxxxxxx; Shaikh, Shahed <Shahed.Shaikh@xxxxxxxxxx>;
> Chopra, Manish <Manish.Chopra@xxxxxxxxxx>; Dept-GE Linux NIC Dev
> <Dept-GELinuxNICDev@xxxxxxxxxx>
> Cc: linux-kernel@xxxxxxxxxxxxxxx; netdev@xxxxxxxxxxxxxxx; YueHaibing
> <yuehaibing@xxxxxxxxxx>
> Subject: [PATCH net-next] qlcnic: remove set but not used variables
> 'cur_rings, max_hw_rings, tx_desc_info'
> 
> 
> Fixes gcc '-Wunused-but-set-variable' warning:
> 
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:4011:5:
>  warning: variable 'max_hw_rings' set but not used [-Wunused-but-set-
> variable]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:4013:6:
>  warning: variable 'cur_rings' set but not used [-Wunused-but-set-variable]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:2996:25:
>  warning: variable 'tx_desc_info' set but not used [-Wunused-but-set-
> variable]
> 
> 'cur_rings, max_hw_rings' never used since introduction in commit
> 34e8c406fda5 ("qlcnic: refactor Tx/SDS ring calculation and validation in
> driver.")
> 'tx_desc_info' never used since commit
> 95b3890ae39f ("qlcnic: Enhance Tx timeout debugging.")
> Also 'queue_type' only can be QLCNIC_RX_QUEUE/QLCNIC_TX_QUEUE,
> so make a trival cleanup on if statement.
> 
> Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
> ---
>  drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 13 ++-----------
>  1 file changed, 2 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
> b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
> index d42ba22..16d0479 100644
> --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
> +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
> @@ -2993,10 +2993,8 @@ int qlcnic_check_temp(struct qlcnic_adapter
> *adapter)
>  static inline void dump_tx_ring_desc(struct qlcnic_host_tx_ring *tx_ring)
>  {
>         int i;
> -       struct cmd_desc_type0 *tx_desc_info;
> 
>         for (i = 0; i < tx_ring->num_desc; i++) {
> -               tx_desc_info = &tx_ring->desc_head[i];
>                 pr_info("TX Desc: %d\n", i);
>                 print_hex_dump(KERN_INFO, "TX: ", DUMP_PREFIX_OFFSET, 16, 1,
>                                &tx_ring->desc_head[i],
> @@ -4008,19 +4006,12 @@ int qlcnic_validate_rings(struct qlcnic_adapter
> *adapter, __u32 ring_cnt,
>                           int queue_type)
>  {
>         struct net_device *netdev = adapter->netdev;
> -       u8 max_hw_rings = 0;
>         char buf[8];
> -       int cur_rings;
> 
> -       if (queue_type == QLCNIC_RX_QUEUE) {
> -               max_hw_rings = adapter->max_sds_rings;
> -               cur_rings = adapter->drv_sds_rings;
> +       if (queue_type == QLCNIC_RX_QUEUE)
>                 strcpy(buf, "SDS");
> -       } else if (queue_type == QLCNIC_TX_QUEUE) {
> -               max_hw_rings = adapter->max_tx_rings;
> -               cur_rings = adapter->drv_tx_rings;
> +       else
>                 strcpy(buf, "Tx");
> -       }
> 
>         if (!is_power_of_2(ring_cnt)) {
>                 netdev_err(netdev, "%s rings value should be a power of 2\n",
> --
> 2.7.0
> 

Looks good.

Acked-by: Shahed Shaikh <shahed.shaikh@xxxxxxxxxx>

Thanks,
Shahed