提交 097675f1 编写于 作者: M moyufeng 提交者: Xie XiuQi

net: hns3: Optimization of some variable types

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

This patch optimizs some variable types to remove the static check
warning.

Feature or Bugfix:Bugfix
Signed-off-by: Nmoyufeng <moyufeng@huawei.com>
Reviewed-by: Nlipeng <lipeng321@huawei.com>
Reviewed-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 10d745eb
...@@ -26,7 +26,8 @@ static bool hnae3_client_match(enum hnae3_client_type client_type) ...@@ -26,7 +26,8 @@ static bool hnae3_client_match(enum hnae3_client_type client_type)
} }
void hnae3_set_client_init_flag(struct hnae3_client *client, void hnae3_set_client_init_flag(struct hnae3_client *client,
struct hnae3_ae_dev *ae_dev, int inited) struct hnae3_ae_dev *ae_dev,
unsigned int inited)
{ {
if (!client || !ae_dev) if (!client || !ae_dev)
return; return;
......
...@@ -660,5 +660,6 @@ void hnae3_unregister_client(struct hnae3_client *client); ...@@ -660,5 +660,6 @@ void hnae3_unregister_client(struct hnae3_client *client);
int hnae3_register_client(struct hnae3_client *client); int hnae3_register_client(struct hnae3_client *client);
void hnae3_set_client_init_flag(struct hnae3_client *client, void hnae3_set_client_init_flag(struct hnae3_client *client,
struct hnae3_ae_dev *ae_dev, int inited); struct hnae3_ae_dev *ae_dev,
unsigned int inited);
#endif #endif
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
static struct dentry *hns3_dbgfs_root; static struct dentry *hns3_dbgfs_root;
static int hns3_dbg_queue_info(struct hnae3_handle *h, char *cmd_buf) static int hns3_dbg_queue_info(struct hnae3_handle *h,
const char *cmd_buf)
{ {
struct hns3_nic_priv *priv = h->priv; struct hns3_nic_priv *priv = h->priv;
struct hns3_nic_ring_data *ring_data; struct hns3_nic_ring_data *ring_data;
...@@ -155,7 +156,7 @@ static int hns3_dbg_queue_map(struct hnae3_handle *h) ...@@ -155,7 +156,7 @@ static int hns3_dbg_queue_map(struct hnae3_handle *h)
return 0; return 0;
} }
static int hns3_dbg_bd_info(struct hnae3_handle *h, char *cmd_buf) static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf)
{ {
struct hns3_nic_priv *priv = h->priv; struct hns3_nic_priv *priv = h->priv;
struct hns3_nic_ring_data *ring_data; struct hns3_nic_ring_data *ring_data;
......
...@@ -1040,7 +1040,8 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb, ...@@ -1040,7 +1040,8 @@ static int hns3_fill_desc_vtags(struct sk_buff *skb,
} }
static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,
int size, int frag_end, enum hns_desc_type type) unsigned int size, int frag_end,
enum hns_desc_type type)
{ {
struct hns3_desc_cb *desc_cb = &ring->desc_cb[ring->next_to_use]; struct hns3_desc_cb *desc_cb = &ring->desc_cb[ring->next_to_use];
struct hns3_desc *desc = &ring->desc[ring->next_to_use]; struct hns3_desc *desc = &ring->desc[ring->next_to_use];
...@@ -3478,7 +3479,7 @@ static int hns3_nic_dealloc_vector_data(struct hns3_nic_priv *priv) ...@@ -3478,7 +3479,7 @@ static int hns3_nic_dealloc_vector_data(struct hns3_nic_priv *priv)
} }
static int hns3_ring_get_cfg(struct hnae3_queue *q, struct hns3_nic_priv *priv, static int hns3_ring_get_cfg(struct hnae3_queue *q, struct hns3_nic_priv *priv,
int ring_type) unsigned int ring_type)
{ {
struct hns3_nic_ring_data *ring_data = priv->ring_data; struct hns3_nic_ring_data *ring_data = priv->ring_data;
int queue_num = priv->ae_handle->kinfo.num_tqps; int queue_num = priv->ae_handle->kinfo.num_tqps;
......
...@@ -65,8 +65,8 @@ static int hclge_dbg_cmd_send(struct hclge_dev *hdev, ...@@ -65,8 +65,8 @@ static int hclge_dbg_cmd_send(struct hclge_dev *hdev,
static void hclge_dbg_dump_reg_common(struct hclge_dev *hdev, static void hclge_dbg_dump_reg_common(struct hclge_dev *hdev,
struct hclge_dbg_dfx_message *dfx_message, struct hclge_dbg_dfx_message *dfx_message,
char *cmd_buf, int msg_num, int offset, const char *cmd_buf, int msg_num,
enum hclge_opcode_type cmd) int offset, enum hclge_opcode_type cmd)
{ {
struct hclge_desc *desc_src; struct hclge_desc *desc_src;
struct hclge_desc *desc; struct hclge_desc *desc;
...@@ -119,7 +119,7 @@ static void hclge_dbg_dump_reg_common(struct hclge_dev *hdev, ...@@ -119,7 +119,7 @@ static void hclge_dbg_dump_reg_common(struct hclge_dev *hdev,
kfree(desc_src); kfree(desc_src);
} }
static void hclge_dbg_dump_dcb(struct hclge_dev *hdev, char *cmd_buf) static void hclge_dbg_dump_dcb(struct hclge_dev *hdev, const char *cmd_buf)
{ {
struct device *dev = &hdev->pdev->dev; struct device *dev = &hdev->pdev->dev;
struct hclge_dbg_bitmap_cmd *bitmap; struct hclge_dbg_bitmap_cmd *bitmap;
...@@ -549,7 +549,8 @@ static void hclge_dbg_dump_tm(struct hclge_dev *hdev) ...@@ -549,7 +549,8 @@ static void hclge_dbg_dump_tm(struct hclge_dev *hdev)
cmd, ret); cmd, ret);
} }
static void hclge_dbg_dump_tm_map(struct hclge_dev *hdev, char *cmd_buf) static void hclge_dbg_dump_tm_map(struct hclge_dev *hdev,
const char *cmd_buf)
{ {
struct hclge_bp_to_qs_map_cmd *bp_to_qs_map_cmd; struct hclge_bp_to_qs_map_cmd *bp_to_qs_map_cmd;
struct hclge_nq_to_qs_link_cmd *nq_to_qs_map; struct hclge_nq_to_qs_link_cmd *nq_to_qs_map;
...@@ -1013,7 +1014,8 @@ static void hclge_ncl_config_data_print(struct hclge_dev *hdev, ...@@ -1013,7 +1014,8 @@ static void hclge_ncl_config_data_print(struct hclge_dev *hdev,
* @hdev: pointer to struct hclge_dev * @hdev: pointer to struct hclge_dev
* @cmd_buf: string that contains offset and length * @cmd_buf: string that contains offset and length
*/ */
static void hclge_dbg_dump_ncl_config(struct hclge_dev *hdev, char *cmd_buf) static void hclge_dbg_dump_ncl_config(struct hclge_dev *hdev,
const char *cmd_buf)
{ {
#define HCLGE_MAX_NCL_CONFIG_OFFSET 16384 #define HCLGE_MAX_NCL_CONFIG_OFFSET 16384
#define HCLGE_MAX_NCL_CONFIG_LENGTH (20 + 24 * 4) #define HCLGE_MAX_NCL_CONFIG_LENGTH (20 + 24 * 4)
......
...@@ -1247,7 +1247,7 @@ static int hclge_configure(struct hclge_dev *hdev) ...@@ -1247,7 +1247,7 @@ static int hclge_configure(struct hclge_dev *hdev)
} }
static int hclge_config_tso(struct hclge_dev *hdev, int tso_mss_min, static int hclge_config_tso(struct hclge_dev *hdev, int tso_mss_min,
int tso_mss_max) unsigned int tso_mss_max)
{ {
struct hclge_cfg_tso_status_cmd *req; struct hclge_cfg_tso_status_cmd *req;
struct hclge_desc desc; struct hclge_desc desc;
...@@ -2414,7 +2414,7 @@ static int hclge_get_mac_link_status(struct hclge_dev *hdev) ...@@ -2414,7 +2414,7 @@ static int hclge_get_mac_link_status(struct hclge_dev *hdev)
static int hclge_get_mac_phy_link(struct hclge_dev *hdev) static int hclge_get_mac_phy_link(struct hclge_dev *hdev)
{ {
int mac_state; unsigned int mac_state;
int link_stat; int link_stat;
if (test_bit(HCLGE_STATE_DOWN, &hdev->state)) if (test_bit(HCLGE_STATE_DOWN, &hdev->state))
...@@ -3622,8 +3622,8 @@ static int hclge_set_rss_algo_key(struct hclge_dev *hdev, ...@@ -3622,8 +3622,8 @@ static int hclge_set_rss_algo_key(struct hclge_dev *hdev,
const u8 hfunc, const u8 *key) const u8 hfunc, const u8 *key)
{ {
struct hclge_rss_config_cmd *req; struct hclge_rss_config_cmd *req;
unsigned int key_offset = 0;
struct hclge_desc desc; struct hclge_desc desc;
int key_offset = 0;
int key_counts; int key_counts;
int key_size; int key_size;
int ret; int ret;
...@@ -6063,7 +6063,8 @@ static int hclge_tqp_enable(struct hclge_dev *hdev, int tqp_id, ...@@ -6063,7 +6063,8 @@ static int hclge_tqp_enable(struct hclge_dev *hdev, int tqp_id,
hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_CFG_COM_TQP_QUEUE, false); hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_CFG_COM_TQP_QUEUE, false);
req->tqp_id = cpu_to_le16(tqp_id & HCLGE_RING_ID_MASK); req->tqp_id = cpu_to_le16(tqp_id & HCLGE_RING_ID_MASK);
req->stream_id = cpu_to_le16(stream_id); req->stream_id = cpu_to_le16(stream_id);
req->enable |= enable << HCLGE_TQP_ENABLE_B; if (enable)
req->enable |= 1U << HCLGE_TQP_ENABLE_B;
ret = hclge_cmd_send(&hdev->hw, &desc, 1); ret = hclge_cmd_send(&hdev->hw, &desc, 1);
if (ret) if (ret)
...@@ -8237,7 +8238,8 @@ static void hclge_get_mdix_mode(struct hnae3_handle *handle, ...@@ -8237,7 +8238,8 @@ static void hclge_get_mdix_mode(struct hnae3_handle *handle,
struct hclge_vport *vport = hclge_get_vport(handle); struct hclge_vport *vport = hclge_get_vport(handle);
struct hclge_dev *hdev = vport->back; struct hclge_dev *hdev = vport->back;
struct phy_device *phydev = hdev->hw.mac.phydev; struct phy_device *phydev = hdev->hw.mac.phydev;
int mdix_ctrl, mdix, retval, is_resolved; int mdix_ctrl, mdix, is_resolved;
unsigned int retval;
if (!phydev) { if (!phydev) {
*tp_mdix_ctrl = ETH_TP_MDI_INVALID; *tp_mdix_ctrl = ETH_TP_MDI_INVALID;
......
...@@ -881,7 +881,7 @@ struct hclge_vport { ...@@ -881,7 +881,7 @@ struct hclge_vport {
u16 used_umv_num; u16 used_umv_num;
int vport_id; u16 vport_id;
struct hclge_dev *back; /* Back reference to associated dev */ struct hclge_dev *back; /* Back reference to associated dev */
struct hnae3_handle nic; struct hnae3_handle nic;
struct hnae3_handle roce; struct hnae3_handle roce;
......
...@@ -583,7 +583,8 @@ void hclge_mbx_handler(struct hclge_dev *hdev) ...@@ -583,7 +583,8 @@ void hclge_mbx_handler(struct hclge_dev *hdev)
struct hclge_mbx_vf_to_pf_cmd *req; struct hclge_mbx_vf_to_pf_cmd *req;
struct hclge_vport *vport; struct hclge_vport *vport;
struct hclge_desc *desc; struct hclge_desc *desc;
int ret, flag; unsigned int flag;
int ret;
/* handle all the mailbox requests in the queue */ /* handle all the mailbox requests in the queue */
while (!hclge_cmd_crq_empty(&hdev->hw)) { while (!hclge_cmd_crq_empty(&hdev->hw)) {
......
...@@ -46,7 +46,7 @@ static int hclge_mdio_write(struct mii_bus *bus, int phyid, int regnum, ...@@ -46,7 +46,7 @@ static int hclge_mdio_write(struct mii_bus *bus, int phyid, int regnum,
hnae3_set_field(mdio_cmd->phyid, HCLGE_MDIO_PHYID_M, hnae3_set_field(mdio_cmd->phyid, HCLGE_MDIO_PHYID_M,
HCLGE_MDIO_PHYID_S, phyid); HCLGE_MDIO_PHYID_S, phyid);
hnae3_set_field(mdio_cmd->phyad, HCLGE_MDIO_PHYREG_M, hnae3_set_field(mdio_cmd->phyad, HCLGE_MDIO_PHYREG_M,
HCLGE_MDIO_PHYREG_S, regnum); HCLGE_MDIO_PHYREG_S, (u32)regnum);
hnae3_set_bit(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_START_B, 1); hnae3_set_bit(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_START_B, 1);
hnae3_set_field(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_ST_M, hnae3_set_field(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_ST_M,
...@@ -84,7 +84,7 @@ static int hclge_mdio_read(struct mii_bus *bus, int phyid, int regnum) ...@@ -84,7 +84,7 @@ static int hclge_mdio_read(struct mii_bus *bus, int phyid, int regnum)
hnae3_set_field(mdio_cmd->phyid, HCLGE_MDIO_PHYID_M, hnae3_set_field(mdio_cmd->phyid, HCLGE_MDIO_PHYID_M,
HCLGE_MDIO_PHYID_S, phyid); HCLGE_MDIO_PHYID_S, phyid);
hnae3_set_field(mdio_cmd->phyad, HCLGE_MDIO_PHYREG_M, hnae3_set_field(mdio_cmd->phyad, HCLGE_MDIO_PHYREG_M,
HCLGE_MDIO_PHYREG_S, regnum); HCLGE_MDIO_PHYREG_S, (u32)regnum);
hnae3_set_bit(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_START_B, 1); hnae3_set_bit(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_START_B, 1);
hnae3_set_field(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_ST_M, hnae3_set_field(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_ST_M,
......
...@@ -502,8 +502,8 @@ static int hclgevf_set_rss_algo_key(struct hclgevf_dev *hdev, ...@@ -502,8 +502,8 @@ static int hclgevf_set_rss_algo_key(struct hclgevf_dev *hdev,
const u8 hfunc, const u8 *key) const u8 hfunc, const u8 *key)
{ {
struct hclgevf_rss_config_cmd *req; struct hclgevf_rss_config_cmd *req;
unsigned int key_offset = 0;
struct hclgevf_desc desc; struct hclgevf_desc desc;
int key_offset = 0;
int key_counts; int key_counts;
int key_size; int key_size;
int ret; int ret;
...@@ -1106,7 +1106,8 @@ static int hclgevf_tqp_enable(struct hclgevf_dev *hdev, int tqp_id, ...@@ -1106,7 +1106,8 @@ static int hclgevf_tqp_enable(struct hclgevf_dev *hdev, int tqp_id,
false); false);
req->tqp_id = cpu_to_le16(tqp_id & HCLGEVF_RING_ID_MASK); req->tqp_id = cpu_to_le16(tqp_id & HCLGEVF_RING_ID_MASK);
req->stream_id = cpu_to_le16(stream_id); req->stream_id = cpu_to_le16(stream_id);
req->enable |= enable << HCLGEVF_TQP_ENABLE_B; if (enable)
req->enable |= 1U << HCLGEVF_TQP_ENABLE_B;
status = hclgevf_cmd_send(&hdev->hw, &desc, 1); status = hclgevf_cmd_send(&hdev->hw, &desc, 1);
if (status) if (status)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册