Commit db4d3d55 authored by Guangbin Huang's avatar Guangbin Huang Committed by David S. Miller
Browse files

net: hns3: cleanup some coding style issues 



To unify code style and make code simpler, this patch modifies
some code, deletes unnecessary blank lines and {}, changes
location of code, and so on.

No functional change.

Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6ad7c53

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ enum hnae3_module_type { 
	HNAE3_MODULE_TYPE_CR		= 0x04,

	HNAE3_MODULE_TYPE_KR		= 0x05,

	HNAE3_MODULE_TYPE_TP		= 0x06,



};



enum hnae3_fec_mode {

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

+2 −3
Original line number Diff line number Diff line
@@ -314,11 +314,10 @@ int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num) 
		} while (timeout < hw->cmq.tx_timeout);

	}



	if (!complete) {

	if (!complete)

		retval = -EBADE;

	} else {

	else

		retval = hclge_cmd_check_retval(hw, desc, num, ntc);

	}



	/* Clean the command send queue */

	handle = hclge_cmd_csq_clean(hw);

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ enum hclge_opcode_type { 


	/* NCL config command */

	HCLGE_OPC_QUERY_NCL_CONFIG	= 0x7011,



	/* M7 stats command */

	HCLGE_OPC_M7_STATS_BD		= 0x7012,

	HCLGE_OPC_M7_STATS_INFO		= 0x7013,

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

+6 −5
Original line number Diff line number Diff line
@@ -2777,7 +2777,7 @@ static void hclge_update_port_capability(struct hclge_mac *mac) 
	else if (mac->media_type == HNAE3_MEDIA_TYPE_COPPER)

		mac->module_type = HNAE3_MODULE_TYPE_TP;



	if (mac->support_autoneg == true) {

	if (mac->support_autoneg) {

		linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, mac->supported);

		linkmode_copy(mac->advertising, mac->supported);

	} else {
@@ -3855,12 +3855,13 @@ static void hclge_reset_event(struct pci_dev *pdev, struct hnae3_handle *handle) 
				  HCLGE_RESET_INTERVAL))) {

		mod_timer(&hdev->reset_timer, jiffies + HCLGE_RESET_INTERVAL);

		return;

	} else if (hdev->default_reset_request)

	} else if (hdev->default_reset_request) {

		hdev->reset_level =

			hclge_get_reset_level(ae_dev,

					      &hdev->default_reset_request);

	else if (time_after(jiffies, (hdev->last_reset_time + 4 * 5 * HZ)))

	} else if (time_after(jiffies, (hdev->last_reset_time + 4 * 5 * HZ))) {

		hdev->reset_level = HNAE3_FUNC_RESET;

	}



	dev_info(&hdev->pdev->dev, "received reset event, reset type is %d\n",

		 hdev->reset_level);
@@ -3985,6 +3986,7 @@ static void hclge_service_task(struct work_struct *work) 
	hclge_update_link_status(hdev);

	hclge_update_vport_alive(hdev);

	hclge_sync_vlan_filter(hdev);



	if (hdev->fd_arfs_expire_timer >= HCLGE_FD_ARFS_EXPIRE_TIMER_INTERVAL) {

		hclge_rfs_filter_expire(hdev);

		hdev->fd_arfs_expire_timer = 0;
@@ -7409,7 +7411,7 @@ void hclge_rm_vport_mac_table(struct hclge_vport *vport, const u8 *mac_addr, 
	mc_flag = is_write_tbl && mac_type == HCLGE_MAC_ADDR_MC;



	list_for_each_entry_safe(mac_cfg, tmp, list, node) {

		if (strncmp(mac_cfg->mac_addr, mac_addr, ETH_ALEN) == 0) {

		if (ether_addr_equal(mac_cfg->mac_addr, mac_addr)) {

			if (uc_flag && mac_cfg->hd_tbl_status)

				hclge_rm_uc_addr_common(vport, mac_addr);
@@ -9093,7 +9095,6 @@ static int hclge_init_client_instance(struct hnae3_client *client, 


		switch (client->type) {

		case HNAE3_CLIENT_KNIC:



			hdev->nic_client = client;

			vport->nic.client = client;

			ret = hclge_init_nic_client_instance(ae_dev, vport);

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2170,7 +2170,6 @@ static int hclgevf_rss_init_hw(struct hclgevf_dev *hdev) 
		ret = hclgevf_set_rss_input_tuple(hdev, rss_cfg);

		if (ret)

			return ret;



	}



	/* Initialize RSS indirect table */

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

+2 −2

File changed.

Contains only whitespace changes.

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

+2 −2

File changed.

Contains only whitespace changes.