Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b2f3477 authored by Weihang Li's avatar Weihang Li Committed by David S. Miller
Browse files

net: hns3: fix some coding style issues 



This patch fixes some coding style issues reported by some static code
analysis tools and code review, such as modify some comments, rename
some variables, log some errors in detail, and fixes some alignment
errors.

BTW, these cleanups do not change the logic of code.

Signed-off-by: default avatarWeihang Li <liweihang@hisilicon.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarHuiSong Li <lihuisong@huawei.com>
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63cbf7a9

drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c

+4 −8
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
#include "hnae3.h"

#include "hns3_enet.h"



static

int hns3_dcbnl_ieee_getets(struct net_device *ndev, struct ieee_ets *ets)

static int hns3_dcbnl_ieee_getets(struct net_device *ndev, struct ieee_ets *ets)

{

	struct hnae3_handle *h = hns3_get_handle(ndev);
@@ -18,8 +17,7 @@ int hns3_dcbnl_ieee_getets(struct net_device *ndev, struct ieee_ets *ets) 
	return -EOPNOTSUPP;

}



static

int hns3_dcbnl_ieee_setets(struct net_device *ndev, struct ieee_ets *ets)

static int hns3_dcbnl_ieee_setets(struct net_device *ndev, struct ieee_ets *ets)

{

	struct hnae3_handle *h = hns3_get_handle(ndev);
@@ -32,8 +30,7 @@ int hns3_dcbnl_ieee_setets(struct net_device *ndev, struct ieee_ets *ets) 
	return -EOPNOTSUPP;

}



static

int hns3_dcbnl_ieee_getpfc(struct net_device *ndev, struct ieee_pfc *pfc)

static int hns3_dcbnl_ieee_getpfc(struct net_device *ndev, struct ieee_pfc *pfc)

{

	struct hnae3_handle *h = hns3_get_handle(ndev);
@@ -46,8 +43,7 @@ int hns3_dcbnl_ieee_getpfc(struct net_device *ndev, struct ieee_pfc *pfc) 
	return -EOPNOTSUPP;

}



static

int hns3_dcbnl_ieee_setpfc(struct net_device *ndev, struct ieee_pfc *pfc)

static int hns3_dcbnl_ieee_setpfc(struct net_device *ndev, struct ieee_pfc *pfc)

{

	struct hnae3_handle *h = hns3_get_handle(ndev);

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+31 −42
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ static int hns3_nic_init_irq(struct hns3_nic_priv *priv) 
		tqp_vectors->name[HNAE3_INT_NAME_LEN - 1] = '\0';



		ret = request_irq(tqp_vectors->vector_irq, hns3_irq_handle, 0,

				  tqp_vectors->name,

				       tqp_vectors);

				  tqp_vectors->name, tqp_vectors);

		if (ret) {

			netdev_err(priv->netdev, "request irq(%d) fail\n",

				   tqp_vectors->vector_irq);
@@ -277,8 +276,7 @@ static int hns3_nic_set_real_num_queue(struct net_device *netdev) 
	ret = netif_set_real_num_tx_queues(netdev, queue_size);

	if (ret) {

		netdev_err(netdev,

			   "netif_set_real_num_tx_queues fail, ret=%d!\n",

			   ret);

			   "netif_set_real_num_tx_queues fail, ret=%d!\n", ret);

		return ret;

	}
@@ -373,7 +371,7 @@ static int hns3_nic_net_up(struct net_device *netdev) 
	/* get irq resource for all vectors */

	ret = hns3_nic_init_irq(priv);

	if (ret) {

		netdev_err(netdev, "hns init irq failed! ret=%d\n", ret);

		netdev_err(netdev, "init irq failed! ret=%d\n", ret);

		goto free_rmap;

	}
@@ -449,16 +447,13 @@ static int hns3_nic_net_open(struct net_device *netdev) 


	ret = hns3_nic_net_up(netdev);

	if (ret) {

		netdev_err(netdev,

			   "hns net up fail, ret=%d!\n", ret);

		netdev_err(netdev, "net up fail, ret=%d!\n", ret);

		return ret;

	}



	kinfo = &h->kinfo;

	for (i = 0; i < HNAE3_MAX_USER_PRIO; i++) {

		netdev_set_prio_tc_map(netdev, i,

				       kinfo->prio_tc[i]);

	}

	for (i = 0; i < HNAE3_MAX_USER_PRIO; i++)

		netdev_set_prio_tc_map(netdev, i, kinfo->prio_tc[i]);



	if (h->ae_algo->ops->set_timer_task)

		h->ae_algo->ops->set_timer_task(priv->ae_handle, true);
@@ -663,7 +658,7 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen, 
	if (l3.v4->version == 4)

		l3.v4->check = 0;



	/* tunnel packet.*/

	/* tunnel packet */

	if (skb_shinfo(skb)->gso_type & (SKB_GSO_GRE |

					 SKB_GSO_GRE_CSUM |

					 SKB_GSO_UDP_TUNNEL |
@@ -800,7 +795,7 @@ static void hns3_set_outer_l2l3l4(struct sk_buff *skb, u8 ol4_proto, 
	hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L3LEN_S, l3_len >> 2);



	il2_hdr = skb_inner_mac_header(skb);

	/* compute OL4 header size, defined in 4 Bytes. */

	/* compute OL4 header size, defined in 4 Bytes */

	l4_len = il2_hdr - l4.hdr;

	hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_L4LEN_S, l4_len >> 2);
@@ -1060,8 +1055,7 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, 
		/* Set txbd */

		desc->tx.ol_type_vlan_len_msec =

			cpu_to_le32(ol_type_vlan_len_msec);

		desc->tx.type_cs_vlan_tso_len =

			cpu_to_le32(type_cs_vlan_tso);

		desc->tx.type_cs_vlan_tso_len =	cpu_to_le32(type_cs_vlan_tso);

		desc->tx.paylen = cpu_to_le32(paylen);

		desc->tx.mss = cpu_to_le16(mss);

		desc->tx.vlan_tag = cpu_to_le16(inner_vtag);
@@ -1120,7 +1114,7 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, 
		desc->tx.bdtp_fe_sc_vld_ra_ri =

				cpu_to_le16(bdtp_fe_sc_vld_ra_ri);



		/* move ring pointer to next.*/

		/* move ring pointer to next */

		ring_ptr_move_fw(ring, next_to_use);



		desc_cb = &ring->desc_cb[ring->next_to_use];
@@ -1828,8 +1822,7 @@ static int hns3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct hnae3_ae_dev *ae_dev;

	int ret;



	ae_dev = devm_kzalloc(&pdev->dev, sizeof(*ae_dev),

			      GFP_KERNEL);

	ae_dev = devm_kzalloc(&pdev->dev, sizeof(*ae_dev), GFP_KERNEL);

	if (!ae_dev) {

		ret = -ENOMEM;

		return ret;
@@ -2209,8 +2202,8 @@ static void hns3_replace_buffer(struct hns3_enet_ring *ring, int i, 
static void hns3_reuse_buffer(struct hns3_enet_ring *ring, int i)

{

	ring->desc_cb[i].reuse_flag = 0;

	ring->desc[i].addr = cpu_to_le64(ring->desc_cb[i].dma

		+ ring->desc_cb[i].page_offset);

	ring->desc[i].addr = cpu_to_le64(ring->desc_cb[i].dma +

					 ring->desc_cb[i].page_offset);

	ring->desc[i].rx.bd_base_info = 0;

}
@@ -2312,8 +2305,8 @@ static int hns3_desc_unused(struct hns3_enet_ring *ring) 
	return ((ntc >= ntu) ? 0 : ring->desc_num) + ntc - ntu;

}



static void

hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring, int cleand_count)

static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring,

				      int cleand_count)

{

	struct hns3_desc_cb *desc_cb;

	struct hns3_desc_cb res_cbs;
@@ -2688,8 +2681,7 @@ static int hns3_set_gro_and_checksum(struct hns3_enet_ring *ring, 
						  HNS3_RXD_GRO_COUNT_M,

						  HNS3_RXD_GRO_COUNT_S);



	l3_type = hnae3_get_field(l234info, HNS3_RXD_L3ID_M,

				  HNS3_RXD_L3ID_S);

	l3_type = hnae3_get_field(l234info, HNS3_RXD_L3ID_M, HNS3_RXD_L3ID_S);

	if (l3_type == HNS3_L3_TYPE_IPV4)

		skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;

	else if (l3_type == HNS3_L3_TYPE_IPV6)
@@ -2877,8 +2869,7 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, 
	return 0;

}



int hns3_clean_rx_ring(

		struct hns3_enet_ring *ring, int budget,

int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget,

		       void (*rx_fn)(struct hns3_enet_ring *, struct sk_buff *))

{

#define RCB_NOF_ALLOC_RX_BUFF_ONCE 16
@@ -2931,8 +2922,7 @@ int hns3_clean_rx_ring( 
out:

	/* Make all data has been write before submit */

	if (clean_count + unused_count > 0)

		hns3_nic_alloc_rx_buffers(ring,

					  clean_count + unused_count);

		hns3_nic_alloc_rx_buffers(ring, clean_count + unused_count);



	return recv_pkts;

}
@@ -3337,6 +3327,7 @@ static int hns3_nic_alloc_vector_data(struct hns3_nic_priv *priv) 
	if (!vector)

		return -ENOMEM;



	/* save the actual available vector number */

	vector_num = h->ae_algo->ops->get_vector(h, vector_num, vector);



	priv->vector_num = vector_num;
@@ -3605,8 +3596,7 @@ static void hns3_init_ring_hw(struct hns3_enet_ring *ring) 
	struct hnae3_queue *q = ring->tqp;



	if (!HNAE3_IS_TX_RING(ring)) {

		hns3_write_dev(q, HNS3_RING_RX_RING_BASEADDR_L_REG,

			       (u32)dma);

		hns3_write_dev(q, HNS3_RING_RX_RING_BASEADDR_L_REG, (u32)dma);

		hns3_write_dev(q, HNS3_RING_RX_RING_BASEADDR_H_REG,

			       (u32)((dma >> 31) >> 1));
@@ -4052,8 +4042,7 @@ static int hns3_clear_rx_ring(struct hns3_enet_ring *ring) 
					    ret);

				return ret;

			}

			hns3_replace_buffer(ring, ring->next_to_use,

					    &res_cbs);

			hns3_replace_buffer(ring, ring->next_to_use, &res_cbs);

		}

		ring_ptr_move_fw(ring, next_to_use);

	}
@@ -4228,7 +4217,7 @@ static int hns3_reset_notify_up_enet(struct hnae3_handle *handle) 
		if (ret) {

			set_bit(HNS3_NIC_STATE_RESETTING, &priv->state);

			netdev_err(kinfo->netdev,

				   "hns net up fail, ret=%d!\n", ret);

				   "net up fail, ret=%d!\n", ret);

			return ret;

		}

	}

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,12 @@ static void hns3_lp_setup_skb(struct sk_buff *skb) 
	packet = skb_put(skb, HNS3_NIC_LB_TEST_PACKET_SIZE);



	memcpy(ethh->h_dest, ndev->dev_addr, ETH_ALEN);



	/* The dst mac addr of loopback packet is the same as the host'

	 * mac addr, the SSU component may loop back the packet to host

	 * before the packet reaches mac or serdes, which will defect

	 * the purpose of mac or serdes selftest.

	 */

	ethh->h_dest[5] += 0x1f;

	eth_zero_addr(ethh->h_source);

	ethh->h_proto = htons(ETH_P_ARP);

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c

+5 −5
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static void hclge_dbg_dump_tm_pg(struct hclge_dev *hdev) 
	if (ret)

		goto err_tm_pg_cmd_send;



	dev_info(&hdev->pdev->dev, "PRI_SCH pg_id: %u\n", desc.data[0]);

	dev_info(&hdev->pdev->dev, "PRI_SCH pri_id: %u\n", desc.data[0]);



	cmd = HCLGE_OPC_TM_QS_SCH_MODE_CFG;

	hclge_cmd_setup_basic_desc(&desc, cmd, true);
@@ -407,7 +407,7 @@ static void hclge_dbg_dump_tm_pg(struct hclge_dev *hdev) 
	if (ret)

		goto err_tm_pg_cmd_send;



	dev_info(&hdev->pdev->dev, "QS_SCH pg_id: %u\n", desc.data[0]);

	dev_info(&hdev->pdev->dev, "QS_SCH qs_id: %u\n", desc.data[0]);



	cmd = HCLGE_OPC_TM_BP_TO_QSET_MAPPING;

	hclge_cmd_setup_basic_desc(&desc, cmd, true);
@@ -416,9 +416,9 @@ static void hclge_dbg_dump_tm_pg(struct hclge_dev *hdev) 
		goto err_tm_pg_cmd_send;



	bp_to_qs_map_cmd = (struct hclge_bp_to_qs_map_cmd *)desc.data;

	dev_info(&hdev->pdev->dev, "BP_TO_QSET pg_id: %u\n",

	dev_info(&hdev->pdev->dev, "BP_TO_QSET tc_id: %u\n",

		 bp_to_qs_map_cmd->tc_id);

	dev_info(&hdev->pdev->dev, "BP_TO_QSET pg_shapping: 0x%x\n",

	dev_info(&hdev->pdev->dev, "BP_TO_QSET qs_group_id: 0x%x\n",

		 bp_to_qs_map_cmd->qs_group_id);

	dev_info(&hdev->pdev->dev, "BP_TO_QSET qs_bit_map: 0x%x\n",

		 bp_to_qs_map_cmd->qs_bit_map);
@@ -477,7 +477,7 @@ static void hclge_dbg_dump_tm(struct hclge_dev *hdev) 


	nq_to_qs_map = (struct hclge_nq_to_qs_link_cmd *)desc.data;

	dev_info(&hdev->pdev->dev, "NQ_TO_QS nq_id: %u\n", nq_to_qs_map->nq_id);

	dev_info(&hdev->pdev->dev, "NQ_TO_QS qset_id: %u\n",

	dev_info(&hdev->pdev->dev, "NQ_TO_QS qset_id: 0x%x\n",

		 nq_to_qs_map->qset_id);



	cmd = HCLGE_OPC_TM_PG_WEIGHT;

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c

+7 −8
Original line number Diff line number Diff line
@@ -673,19 +673,19 @@ static int hclge_cmd_query_error(struct hclge_dev *hdev, 
				 enum hclge_err_int_type int_type)

{

	struct device *dev = &hdev->pdev->dev;

	int num = 1;

	int desc_num = 1;

	int ret;



	hclge_cmd_setup_basic_desc(&desc[0], cmd, true);

	if (flag) {

		desc[0].flag |= cpu_to_le16(flag);

		hclge_cmd_setup_basic_desc(&desc[1], cmd, true);

		num = 2;

		desc_num = 2;

	}

	if (w_num)

		desc[0].data[w_num] = cpu_to_le32(int_type);



	ret = hclge_cmd_send(&hdev->hw, &desc[0], num);

	ret = hclge_cmd_send(&hdev->hw, &desc[0], desc_num);

	if (ret)

		dev_err(dev, "query error cmd failed (%d)\n", ret);
@@ -941,7 +941,7 @@ static int hclge_config_ppu_error_interrupts(struct hclge_dev *hdev, u32 cmd, 
{

	struct device *dev = &hdev->pdev->dev;

	struct hclge_desc desc[2];

	int num = 1;

	int desc_num = 1;

	int ret;



	/* configure PPU error interrupts */
@@ -960,7 +960,7 @@ static int hclge_config_ppu_error_interrupts(struct hclge_dev *hdev, u32 cmd, 
		desc[1].data[1] = HCLGE_PPU_MPF_ABNORMAL_INT1_EN_MASK;

		desc[1].data[2] = HCLGE_PPU_MPF_ABNORMAL_INT2_EN_MASK;

		desc[1].data[3] |= HCLGE_PPU_MPF_ABNORMAL_INT3_EN_MASK;

		num = 2;

		desc_num = 2;

	} else if (cmd == HCLGE_PPU_MPF_OTHER_INT_CMD) {

		hclge_cmd_setup_basic_desc(&desc[0], cmd, false);

		if (en)
@@ -978,7 +978,7 @@ static int hclge_config_ppu_error_interrupts(struct hclge_dev *hdev, u32 cmd, 
		return -EINVAL;

	}



	ret = hclge_cmd_send(&hdev->hw, &desc[0], num);

	ret = hclge_cmd_send(&hdev->hw, &desc[0], desc_num);



	return ret;

}
@@ -1455,8 +1455,7 @@ static int hclge_log_rocee_ovf_error(struct hclge_dev *hdev) 
	int ret;



	/* read overflow error status */

	ret = hclge_cmd_query_error(hdev, &desc[0],

				    HCLGE_ROCEE_PF_RAS_INT_CMD,

	ret = hclge_cmd_query_error(hdev, &desc[0], HCLGE_ROCEE_PF_RAS_INT_CMD,

				    0, 0, 0);

	if (ret) {

		dev_err(dev, "failed(%d) to query ROCEE OVF error sts\n", ret);