Commit 37417c66 authored by Guojia Liao's avatar Guojia Liao Committed by David S. Miller
Browse files

net: hns3: fix error and incorrect format 



The pointer type parameter should be declare as const for preventing
from its pointed value being unexpected modified.

The uninitialized variable can not be return directly. The default
return value is 0 if no abnormal result.

This patch fixes the preceding two errors, deletes redundant
declaration of a function and align one parameter.

Signed-off-by: default avatarGuojia Liao <liaoguojia@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@hisilicon.com>
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
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 cdd332ac

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

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int hns3_get_link_ksettings(struct net_device *netdev, 
	return 0;

}



static int hns3_check_ksettings_param(struct net_device *netdev,

static int hns3_check_ksettings_param(const struct net_device *netdev,

				      const struct ethtool_link_ksettings *cmd)

{

	struct hnae3_handle *handle = hns3_get_handle(netdev);

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

+4 −3
Original line number Diff line number Diff line
@@ -1128,6 +1128,7 @@ static void hclge_parse_link_mode(struct hclge_dev *hdev, u8 speed_ability) 
	else if (media_type == HNAE3_MEDIA_TYPE_BACKPLANE)

		hclge_parse_backplane_link_mode(hdev, speed_ability);

}



static void hclge_parse_cfg(struct hclge_cfg *cfg, struct hclge_desc *desc)

{

	struct hclge_cfg_param_cmd *req;
@@ -4364,8 +4365,8 @@ int hclge_bind_ring_with_vector(struct hclge_vport *vport, 
	struct hclge_dev *hdev = vport->back;

	struct hnae3_ring_chain_node *node;

	struct hclge_desc desc;

	struct hclge_ctrl_vector_chain_cmd *req

		= (struct hclge_ctrl_vector_chain_cmd *)desc.data;

	struct hclge_ctrl_vector_chain_cmd *req =

		(struct hclge_ctrl_vector_chain_cmd *)desc.data;

	enum hclge_cmd_status status;

	enum hclge_opcode_type op;

	u16 tqp_type_and_id;
@@ -8656,7 +8657,7 @@ static int hclge_init_client_instance(struct hnae3_client *client, 
		}

	}



	return ret;

	return 0;



clear_nic:

	hdev->nic_client = NULL;

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

+0 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,6 @@ int hclge_buffer_alloc(struct hclge_dev *hdev); 
int hclge_rss_init_hw(struct hclge_dev *hdev);

void hclge_rss_indir_init_cfg(struct hclge_dev *hdev);



int hclge_inform_reset_assert_to_vf(struct hclge_vport *vport);

void hclge_mbx_handler(struct hclge_dev *hdev);

int hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id);

void hclge_reset_vf_queue(struct hclge_vport *vport, u16 queue_id);

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

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE