net: hns: remove redundant variables 'max_frm' and 'tmp_mac_key'

Variables 'max_frm' and 'tmp_mac_key' are being assigned,
but are never used,hence they are redundant and can be removed.

fix fllowing warning:

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c:461:6: warning: variable 'max_frm' set but not used [-Wunused-but-set-variable]
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c:1685:31: warning: variable 'tmp_mac_key' set but not used [-Wunused-but-set-variable]
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c:1855:41: warning: variable 'tmp_mac_key' set but not used [-Wunused-but-set-variable]

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index 6e5107d428c74b68b7366a73e3d54e75c3e8522c..3545a5d0bc95214ecc5fe320f4b0f8557dce6993 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -458,11 +458,6 @@ int hns_mac_set_mtu(struct hns_mac_cb *mac_cb, u32 new_mtu, u32 buf_size)
 {
        struct mac_driver *drv = hns_mac_get_drv(mac_cb);
        u32 new_frm = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
-       u32 max_frm = AE_IS_VER1(mac_cb->dsaf_dev->dsaf_ver) ?
-                       MAC_MAX_MTU : MAC_MAX_MTU_V2;
-
-       if (mac_cb->mac_type == HNAE_PORT_DEBUG)
-               max_frm = MAC_MAX_MTU_DBG;
 
        if (new_frm > HNS_RCB_RING_MAX_BD_PER_PKT * buf_size)
                return -EINVAL;

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
index 619e6ce465c2060484c84c08a83e0aab29b75533..ca50c2553a9cb16c92e2d1dbfeaac7e03808fc71 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
@@ -1683,7 +1683,6 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,
        struct dsaf_tbl_tcam_mcast_cfg mac_data;
        struct dsaf_drv_priv *priv = hns_dsaf_dev_priv(dsaf_dev);
        struct dsaf_drv_soft_mac_tbl *soft_mac_entry = priv->soft_mac_tbl;
-       struct dsaf_drv_tbl_tcam_key tmp_mac_key;
        struct dsaf_tbl_tcam_data tcam_data;
        u8 mc_addr[ETH_ALEN];
        int mskid;
@@ -1740,10 +1739,6 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,
                /* if exist, add in */
                hns_dsaf_tcam_mc_get(dsaf_dev, entry_index, &tcam_data,
                                     &mac_data);
-
-               tmp_mac_key.high.val =
-                       le32_to_cpu(tcam_data.tbl_tcam_data_high);
-               tmp_mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);
        }
 
        /* config hardware entry */
@@ -1853,7 +1848,7 @@ int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,
        struct dsaf_tbl_tcam_data tcam_data;
        int mskid;
        const u8 empty_msk[sizeof(mac_data.tbl_mcast_port_msk)] = {0};
-       struct dsaf_drv_tbl_tcam_key mask_key, tmp_mac_key;
+       struct dsaf_drv_tbl_tcam_key mask_key;
        struct dsaf_tbl_tcam_data *pmask_key = NULL;
        u8 mc_addr[ETH_ALEN];
 
@@ -1916,9 +1911,6 @@ int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,
        /* read entry */
        hns_dsaf_tcam_mc_get(dsaf_dev, entry_index, &tcam_data, &mac_data);
 
-       tmp_mac_key.high.val = le32_to_cpu(tcam_data.tbl_tcam_data_high);
-       tmp_mac_key.low.val = le32_to_cpu(tcam_data.tbl_tcam_data_low);
-
        /*del the port*/
        if (mac_entry->port_num < DSAF_SERVICE_NW_NUM) {
                mskid = mac_entry->port_num;