Commit 7f8bcd91 authored by Yonglong Liu's avatar Yonglong Liu Committed by David S. Miller

net: hns: remove redundant variable initialization

There are some variables in HNS driver will not being referenced
before assigned, so there is no need to init them.
Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a4ec57c
...@@ -630,7 +630,7 @@ static void hns_ae_update_stats(struct hnae_handle *handle, ...@@ -630,7 +630,7 @@ static void hns_ae_update_stats(struct hnae_handle *handle,
struct hnae_vf_cb *vf_cb = hns_ae_get_vf_cb(handle); struct hnae_vf_cb *vf_cb = hns_ae_get_vf_cb(handle);
u64 tx_bytes = 0, rx_bytes = 0, tx_packets = 0, rx_packets = 0; u64 tx_bytes = 0, rx_bytes = 0, tx_packets = 0, rx_packets = 0;
u64 rx_errors = 0, tx_errors = 0, tx_dropped = 0; u64 rx_errors = 0, tx_errors = 0, tx_dropped = 0;
u64 rx_missed_errors = 0; u64 rx_missed_errors;
dsaf_dev = hns_ae_get_dsaf_dev(handle->dev); dsaf_dev = hns_ae_get_dsaf_dev(handle->dev);
if (!dsaf_dev) if (!dsaf_dev)
......
...@@ -1202,7 +1202,7 @@ void hns_mac_get_regs(struct hns_mac_cb *mac_cb, void *data) ...@@ -1202,7 +1202,7 @@ void hns_mac_get_regs(struct hns_mac_cb *mac_cb, void *data)
void hns_set_led_opt(struct hns_mac_cb *mac_cb) void hns_set_led_opt(struct hns_mac_cb *mac_cb)
{ {
int nic_data = 0; int nic_data;
int txpkts, rxpkts; int txpkts, rxpkts;
txpkts = mac_cb->txpkt_for_led - mac_cb->hw_stats.tx_good_pkts; txpkts = mac_cb->txpkt_for_led - mac_cb->hw_stats.tx_good_pkts;
......
...@@ -1613,7 +1613,7 @@ int hns_dsaf_set_mac_uc_entry( ...@@ -1613,7 +1613,7 @@ int hns_dsaf_set_mac_uc_entry(
struct dsaf_device *dsaf_dev, struct dsaf_device *dsaf_dev,
struct dsaf_drv_mac_single_dest_entry *mac_entry) struct dsaf_drv_mac_single_dest_entry *mac_entry)
{ {
u16 entry_index = DSAF_INVALID_ENTRY_IDX; u16 entry_index;
struct dsaf_drv_tbl_tcam_key mac_key; struct dsaf_drv_tbl_tcam_key mac_key;
struct dsaf_tbl_tcam_ucast_cfg mac_data; struct dsaf_tbl_tcam_ucast_cfg mac_data;
struct dsaf_drv_priv *priv = struct dsaf_drv_priv *priv =
...@@ -1679,7 +1679,7 @@ int hns_dsaf_rm_mac_addr( ...@@ -1679,7 +1679,7 @@ int hns_dsaf_rm_mac_addr(
struct dsaf_device *dsaf_dev, struct dsaf_device *dsaf_dev,
struct dsaf_drv_mac_single_dest_entry *mac_entry) struct dsaf_drv_mac_single_dest_entry *mac_entry)
{ {
u16 entry_index = DSAF_INVALID_ENTRY_IDX; u16 entry_index;
struct dsaf_tbl_tcam_ucast_cfg mac_data; struct dsaf_tbl_tcam_ucast_cfg mac_data;
struct dsaf_drv_tbl_tcam_key mac_key; struct dsaf_drv_tbl_tcam_key mac_key;
...@@ -1751,7 +1751,7 @@ static void hns_dsaf_mc_mask_bit_clear(char *dst, const char *src) ...@@ -1751,7 +1751,7 @@ static void hns_dsaf_mc_mask_bit_clear(char *dst, const char *src)
int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev, int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,
struct dsaf_drv_mac_single_dest_entry *mac_entry) struct dsaf_drv_mac_single_dest_entry *mac_entry)
{ {
u16 entry_index = DSAF_INVALID_ENTRY_IDX; u16 entry_index;
struct dsaf_drv_tbl_tcam_key mac_key; struct dsaf_drv_tbl_tcam_key mac_key;
struct dsaf_drv_tbl_tcam_key mask_key; struct dsaf_drv_tbl_tcam_key mask_key;
struct dsaf_tbl_tcam_data *pmask_key = NULL; struct dsaf_tbl_tcam_data *pmask_key = NULL;
...@@ -1861,7 +1861,7 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev, ...@@ -1861,7 +1861,7 @@ int hns_dsaf_add_mac_mc_port(struct dsaf_device *dsaf_dev,
int hns_dsaf_del_mac_entry(struct dsaf_device *dsaf_dev, u16 vlan_id, int hns_dsaf_del_mac_entry(struct dsaf_device *dsaf_dev, u16 vlan_id,
u8 in_port_num, u8 *addr) u8 in_port_num, u8 *addr)
{ {
u16 entry_index = DSAF_INVALID_ENTRY_IDX; u16 entry_index;
struct dsaf_drv_tbl_tcam_key mac_key; struct dsaf_drv_tbl_tcam_key mac_key;
struct dsaf_drv_priv *priv = struct dsaf_drv_priv *priv =
(struct dsaf_drv_priv *)hns_dsaf_dev_priv(dsaf_dev); (struct dsaf_drv_priv *)hns_dsaf_dev_priv(dsaf_dev);
...@@ -1910,7 +1910,7 @@ int hns_dsaf_del_mac_entry(struct dsaf_device *dsaf_dev, u16 vlan_id, ...@@ -1910,7 +1910,7 @@ int hns_dsaf_del_mac_entry(struct dsaf_device *dsaf_dev, u16 vlan_id,
int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev, int hns_dsaf_del_mac_mc_port(struct dsaf_device *dsaf_dev,
struct dsaf_drv_mac_single_dest_entry *mac_entry) struct dsaf_drv_mac_single_dest_entry *mac_entry)
{ {
u16 entry_index = DSAF_INVALID_ENTRY_IDX; u16 entry_index;
struct dsaf_drv_tbl_tcam_key mac_key; struct dsaf_drv_tbl_tcam_key mac_key;
struct dsaf_drv_priv *priv = hns_dsaf_dev_priv(dsaf_dev); 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_soft_mac_tbl *soft_mac_entry = priv->soft_mac_tbl;
...@@ -2264,7 +2264,7 @@ void hns_dsaf_update_stats(struct dsaf_device *dsaf_dev, u32 node_num) ...@@ -2264,7 +2264,7 @@ void hns_dsaf_update_stats(struct dsaf_device *dsaf_dev, u32 node_num)
*/ */
void hns_dsaf_get_regs(struct dsaf_device *ddev, u32 port, void *data) void hns_dsaf_get_regs(struct dsaf_device *ddev, u32 port, void *data)
{ {
u32 i = 0; u32 i;
u32 j; u32 j;
u32 *p = data; u32 *p = data;
u32 reg_tmp; u32 reg_tmp;
...@@ -2768,7 +2768,7 @@ static void set_promisc_tcam_enable(struct dsaf_device *dsaf_dev, u32 port) ...@@ -2768,7 +2768,7 @@ static void set_promisc_tcam_enable(struct dsaf_device *dsaf_dev, u32 port)
struct dsaf_drv_mac_single_dest_entry mask_entry; struct dsaf_drv_mac_single_dest_entry mask_entry;
struct dsaf_drv_tbl_tcam_key temp_key, mask_key; struct dsaf_drv_tbl_tcam_key temp_key, mask_key;
struct dsaf_drv_soft_mac_tbl *soft_mac_entry; struct dsaf_drv_soft_mac_tbl *soft_mac_entry;
u16 entry_index = DSAF_INVALID_ENTRY_IDX; u16 entry_index;
struct dsaf_drv_tbl_tcam_key mac_key; struct dsaf_drv_tbl_tcam_key mac_key;
struct hns_mac_cb *mac_cb; struct hns_mac_cb *mac_cb;
u8 addr[ETH_ALEN] = {0}; u8 addr[ETH_ALEN] = {0};
...@@ -2870,7 +2870,7 @@ static void set_promisc_tcam_disable(struct dsaf_device *dsaf_dev, u32 port) ...@@ -2870,7 +2870,7 @@ static void set_promisc_tcam_disable(struct dsaf_device *dsaf_dev, u32 port)
struct dsaf_tbl_tcam_data tbl_tcam_data_uc = {0, 0}; struct dsaf_tbl_tcam_data tbl_tcam_data_uc = {0, 0};
struct dsaf_tbl_tcam_data tbl_tcam_mask = {0, 0}; struct dsaf_tbl_tcam_data tbl_tcam_mask = {0, 0};
struct dsaf_drv_soft_mac_tbl *soft_mac_entry; struct dsaf_drv_soft_mac_tbl *soft_mac_entry;
u16 entry_index = DSAF_INVALID_ENTRY_IDX; u16 entry_index;
struct dsaf_drv_tbl_tcam_key mac_key; struct dsaf_drv_tbl_tcam_key mac_key;
u8 addr[ETH_ALEN] = {0}; u8 addr[ETH_ALEN] = {0};
......
...@@ -974,7 +974,7 @@ void hns_rcb_get_common_regs(struct rcb_common_cb *rcb_com, void *data) ...@@ -974,7 +974,7 @@ void hns_rcb_get_common_regs(struct rcb_common_cb *rcb_com, void *data)
bool is_dbg = HNS_DSAF_IS_DEBUG(rcb_com->dsaf_dev); bool is_dbg = HNS_DSAF_IS_DEBUG(rcb_com->dsaf_dev);
u32 reg_tmp; u32 reg_tmp;
u32 reg_num_tmp; u32 reg_num_tmp;
u32 i = 0; u32 i;
/*rcb common registers */ /*rcb common registers */
regs[0] = dsaf_read_dev(rcb_com, RCB_COM_CFG_ENDIAN_REG); regs[0] = dsaf_read_dev(rcb_com, RCB_COM_CFG_ENDIAN_REG);
...@@ -1045,7 +1045,7 @@ void hns_rcb_get_ring_regs(struct hnae_queue *queue, void *data) ...@@ -1045,7 +1045,7 @@ void hns_rcb_get_ring_regs(struct hnae_queue *queue, void *data)
u32 *regs = data; u32 *regs = data;
struct ring_pair_cb *ring_pair struct ring_pair_cb *ring_pair
= container_of(queue, struct ring_pair_cb, q); = container_of(queue, struct ring_pair_cb, q);
u32 i = 0; u32 i;
/*rcb ring registers */ /*rcb ring registers */
regs[0] = dsaf_read_dev(queue, RCB_RING_RX_RING_BASEADDR_L_REG); regs[0] = dsaf_read_dev(queue, RCB_RING_RX_RING_BASEADDR_L_REG);
......
...@@ -482,7 +482,7 @@ static void hns_xgmac_get_link_status(void *mac_drv, u32 *link_stat) ...@@ -482,7 +482,7 @@ static void hns_xgmac_get_link_status(void *mac_drv, u32 *link_stat)
*/ */
static void hns_xgmac_get_regs(void *mac_drv, void *data) static void hns_xgmac_get_regs(void *mac_drv, void *data)
{ {
u32 i = 0; u32 i;
struct mac_driver *drv = (struct mac_driver *)mac_drv; struct mac_driver *drv = (struct mac_driver *)mac_drv;
u32 *regs = data; u32 *regs = data;
u64 qtmp; u64 qtmp;
......
...@@ -872,7 +872,7 @@ static int hns_nic_rx_poll_one(struct hns_nic_ring_data *ring_data, ...@@ -872,7 +872,7 @@ static int hns_nic_rx_poll_one(struct hns_nic_ring_data *ring_data,
static bool hns_nic_rx_fini_pro(struct hns_nic_ring_data *ring_data) static bool hns_nic_rx_fini_pro(struct hns_nic_ring_data *ring_data)
{ {
struct hnae_ring *ring = ring_data->ring; struct hnae_ring *ring = ring_data->ring;
int num = 0; int num;
bool rx_stopped; bool rx_stopped;
hns_update_rx_rate(ring); hns_update_rx_rate(ring);
...@@ -1881,7 +1881,7 @@ static void hns_nic_set_rx_mode(struct net_device *ndev) ...@@ -1881,7 +1881,7 @@ static void hns_nic_set_rx_mode(struct net_device *ndev)
static void hns_nic_get_stats64(struct net_device *ndev, static void hns_nic_get_stats64(struct net_device *ndev,
struct rtnl_link_stats64 *stats) struct rtnl_link_stats64 *stats)
{ {
int idx = 0; int idx;
u64 tx_bytes = 0; u64 tx_bytes = 0;
u64 rx_bytes = 0; u64 rx_bytes = 0;
u64 tx_pkts = 0; u64 tx_pkts = 0;
......
...@@ -279,7 +279,7 @@ static int hns_mdio_write(struct mii_bus *bus, ...@@ -279,7 +279,7 @@ static int hns_mdio_write(struct mii_bus *bus,
static int hns_mdio_read(struct mii_bus *bus, int phy_id, int regnum) static int hns_mdio_read(struct mii_bus *bus, int phy_id, int regnum)
{ {
int ret; int ret;
u16 reg_val = 0; u16 reg_val;
u8 devad = ((regnum >> 16) & 0x1f); u8 devad = ((regnum >> 16) & 0x1f);
u8 is_c45 = !!(regnum & MII_ADDR_C45); u8 is_c45 = !!(regnum & MII_ADDR_C45);
u16 reg = (u16)(regnum & 0xffff); u16 reg = (u16)(regnum & 0xffff);
...@@ -420,7 +420,7 @@ static int hns_mdio_probe(struct platform_device *pdev) ...@@ -420,7 +420,7 @@ static int hns_mdio_probe(struct platform_device *pdev)
{ {
struct hns_mdio_device *mdio_dev; struct hns_mdio_device *mdio_dev;
struct mii_bus *new_bus; struct mii_bus *new_bus;
int ret = -ENODEV; int ret;
if (!pdev) { if (!pdev) {
dev_err(NULL, "pdev is NULL!\r\n"); dev_err(NULL, "pdev is NULL!\r\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment