From 9d9f95a94097a21ee7a910db35c9b15ac1426724 Mon Sep 17 00:00:00 2001 From: Luo bin Date: Tue, 30 Jun 2020 10:30:34 +0800 Subject: hinic: remove unused but set variable remove unused but set variable to avoid auto build test WARNING Signed-off-by: Luo bin Reported-by: kernel test robot Signed-off-by: David S. Miller --- drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 18 ------------------ drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 2 -- 2 files changed, 20 deletions(-) (limited to 'drivers/net/ethernet/huawei') diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c index a4a2a2d68f5c..cb5ebae54f73 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c @@ -749,12 +749,9 @@ static int __set_hw_coal_param(struct hinic_dev *nic_dev, static int __hinic_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coal, u16 queue) { - struct hinic_intr_coal_info *ori_rx_intr_coal = NULL; - struct hinic_intr_coal_info *ori_tx_intr_coal = NULL; struct hinic_dev *nic_dev = netdev_priv(netdev); struct hinic_intr_coal_info rx_intr_coal = {0}; struct hinic_intr_coal_info tx_intr_coal = {0}; - char obj_str[OBJ_STR_MAX_LEN] = {0}; bool set_rx_coal = false; bool set_tx_coal = false; int err; @@ -779,21 +776,6 @@ static int __hinic_set_coalesce(struct net_device *netdev, set_tx_coal = true; } - if (queue == COALESCE_ALL_QUEUE) { - ori_rx_intr_coal = &nic_dev->rx_intr_coalesce[0]; - ori_tx_intr_coal = &nic_dev->tx_intr_coalesce[0]; - err = snprintf(obj_str, OBJ_STR_MAX_LEN, "for netdev"); - } else { - ori_rx_intr_coal = &nic_dev->rx_intr_coalesce[queue]; - ori_tx_intr_coal = &nic_dev->tx_intr_coalesce[queue]; - err = snprintf(obj_str, OBJ_STR_MAX_LEN, "for queue %d", queue); - } - if (err <= 0 || err >= OBJ_STR_MAX_LEN) { - netif_err(nic_dev, drv, netdev, "Failed to snprintf string, function return(%d) and dest_len(%d)\n", - err, OBJ_STR_MAX_LEN); - return -EFAULT; - } - /* setting coalesce timer or pending limit to zero will disable * coalesce */ diff --git a/drivers/net/ethernet/huawei/hinic/hinic_sriov.c b/drivers/net/ethernet/huawei/hinic/hinic_sriov.c index f5c7c1f48542..caf7e81e3f62 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_sriov.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_sriov.c @@ -1060,9 +1060,7 @@ static int hinic_init_vf_infos(struct hinic_func_to_io *nic_io, u16 vf_id) static void hinic_clear_vf_infos(struct hinic_dev *nic_dev, u16 vf_id) { struct vf_data_storage *vf_infos; - u16 func_id; - func_id = hinic_glb_pf_vf_offset(nic_dev->hwdev->hwif) + vf_id; vf_infos = nic_dev->hwdev->func_to_io.vf_infos + HW_VF_ID_TO_OS(vf_id); if (vf_infos->pf_set_mac) hinic_port_del_mac(nic_dev, vf_infos->vf_mac_addr, 0); -- cgit v1.2.3-59-g8ed1b