mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

net: hinic: remove unnecessary parentheses

Browse source 
There are some unnecessary parentheses, this patch deletes them.

Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Guangbin Huang 2021-05-13 14:26:52 +08:00 committed by David S. Miller
parent 3402ab54a8
commit c8ad5df615
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c
View file

@ -223,7 +223,7 @@ static void cmdq_prepare_wqe_ctrl(struct hinic_cmdq_wqe *wqe, int wrapped,
saved_data = CMDQ_WQE_HEADER(wqe)->saved_data; saved_data = CMDQ_WQE_HEADER(wqe)->saved_data;
saved_data = HINIC_SAVED_DATA_CLEAR(saved_data, ARM); saved_data = HINIC_SAVED_DATA_CLEAR(saved_data, ARM);
if ((cmd == CMDQ_SET_ARM_CMD) && (mod == HINIC_MOD_COMM)) if (cmd == CMDQ_SET_ARM_CMD && mod == HINIC_MOD_COMM)
CMDQ_WQE_HEADER(wqe)->saved_data |= CMDQ_WQE_HEADER(wqe)->saved_data |=
HINIC_SAVED_DATA_SET(1, ARM); HINIC_SAVED_DATA_SET(1, ARM);
else else

10
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c
View file

@ -257,7 +257,7 @@ static int init_fw_ctxt(struct hinic_hwdev *hwdev)
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_FWCTXT_INIT, err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_FWCTXT_INIT,
&fw_ctxt, sizeof(fw_ctxt), &fw_ctxt, sizeof(fw_ctxt),
&fw_ctxt, &out_size); &fw_ctxt, &out_size);
if (err || (out_size != sizeof(fw_ctxt)) || fw_ctxt.status) { if (err || out_size != sizeof(fw_ctxt) || fw_ctxt.status) {
dev_err(&pdev->dev, "Failed to init FW ctxt, err: %d, status: 0x%x, out size: 0x%x\n", dev_err(&pdev->dev, "Failed to init FW ctxt, err: %d, status: 0x%x, out size: 0x%x\n",
err, fw_ctxt.status, out_size); err, fw_ctxt.status, out_size);
return -EIO; return -EIO;
@ -424,7 +424,7 @@ static int get_base_qpn(struct hinic_hwdev *hwdev, u16 *base_qpn)
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_GLOBAL_QPN, err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_GLOBAL_QPN,
&cmd_base_qpn, sizeof(cmd_base_qpn), &cmd_base_qpn, sizeof(cmd_base_qpn),
&cmd_base_qpn, &out_size); &cmd_base_qpn, &out_size);
if (err || (out_size != sizeof(cmd_base_qpn)) || cmd_base_qpn.status) { if (err || out_size != sizeof(cmd_base_qpn) || cmd_base_qpn.status) {
dev_err(&pdev->dev, "Failed to get base qpn, err: %d, status: 0x%x, out size: 0x%x\n", dev_err(&pdev->dev, "Failed to get base qpn, err: %d, status: 0x%x, out size: 0x%x\n",
err, cmd_base_qpn.status, out_size); err, cmd_base_qpn.status, out_size);
return -EIO; return -EIO;
@ -605,8 +605,8 @@ static void nic_mgmt_msg_handler(void *handle, u8 cmd, void *buf_in,
hwif = hwdev->hwif; hwif = hwdev->hwif;
pdev = hwif->pdev; pdev = hwif->pdev;
if ((cmd < HINIC_MGMT_MSG_CMD_BASE) || if (cmd < HINIC_MGMT_MSG_CMD_BASE ||
(cmd >= HINIC_MGMT_MSG_CMD_MAX)) { cmd >= HINIC_MGMT_MSG_CMD_MAX) {
dev_err(&pdev->dev, "unknown L2NIC event, cmd = %d\n", cmd); dev_err(&pdev->dev, "unknown L2NIC event, cmd = %d\n", cmd);
return; return;
} }
@ -619,7 +619,7 @@ static void nic_mgmt_msg_handler(void *handle, u8 cmd, void *buf_in,
HINIC_CB_ENABLED, HINIC_CB_ENABLED,
HINIC_CB_ENABLED | HINIC_CB_RUNNING); HINIC_CB_ENABLED | HINIC_CB_RUNNING);
if ((cb_state == HINIC_CB_ENABLED) && (nic_cb->handler)) if (cb_state == HINIC_CB_ENABLED && nic_cb->handler)
nic_cb->handler(nic_cb->handle, buf_in, nic_cb->handler(nic_cb->handle, buf_in,
in_size, buf_out, out_size); in_size, buf_out, out_size);
else else

6
drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c
View file

@ -254,8 +254,8 @@ static void aeq_irq_handler(struct hinic_eq *eq)
HINIC_EQE_ENABLED, HINIC_EQE_ENABLED,
HINIC_EQE_ENABLED | HINIC_EQE_ENABLED |
HINIC_EQE_RUNNING); HINIC_EQE_RUNNING);
if ((eqe_state == HINIC_EQE_ENABLED) && if (eqe_state == HINIC_EQE_ENABLED &&
(hwe_cb->hwe_handler)) hwe_cb->hwe_handler)
hwe_cb->hwe_handler(hwe_cb->handle, hwe_cb->hwe_handler(hwe_cb->handle,
aeqe_curr->data, size); aeqe_curr->data, size);
else else
@ -299,7 +299,7 @@ static void ceq_event_handler(struct hinic_ceqs *ceqs, u32 ceqe)
HINIC_EQE_ENABLED, HINIC_EQE_ENABLED,
HINIC_EQE_ENABLED | HINIC_EQE_RUNNING); HINIC_EQE_ENABLED | HINIC_EQE_RUNNING);
if ((eqe_state == HINIC_EQE_ENABLED) && (ceq_cb->handler)) if (eqe_state == HINIC_EQE_ENABLED && ceq_cb->handler)
ceq_cb->handler(ceq_cb->handle, CEQE_DATA(ceqe)); ceq_cb->handler(ceq_cb->handle, CEQE_DATA(ceqe));
else else
dev_err(&pdev->dev, "Unhandled CEQ Event %d\n", event); dev_err(&pdev->dev, "Unhandled CEQ Event %d\n", event);

4
drivers/net/ethernet/huawei/hinic/hinic_hw_io.c
View file

@ -137,7 +137,7 @@ static int write_sq_ctxts(struct hinic_func_to_io *func_to_io, u16 base_qpn,
err = hinic_cmdq_direct_resp(&func_to_io->cmdqs, HINIC_MOD_L2NIC, err = hinic_cmdq_direct_resp(&func_to_io->cmdqs, HINIC_MOD_L2NIC,
IO_CMD_MODIFY_QUEUE_CTXT, &cmdq_buf, IO_CMD_MODIFY_QUEUE_CTXT, &cmdq_buf,
&out_param); &out_param);
if ((err) || (out_param != 0)) { if (err || out_param != 0) {
dev_err(&pdev->dev, "Failed to set SQ ctxts\n"); dev_err(&pdev->dev, "Failed to set SQ ctxts\n");
err = -EFAULT; err = -EFAULT;
} }
@ -181,7 +181,7 @@ static int write_rq_ctxts(struct hinic_func_to_io *func_to_io, u16 base_qpn,
err = hinic_cmdq_direct_resp(&func_to_io->cmdqs, HINIC_MOD_L2NIC, err = hinic_cmdq_direct_resp(&func_to_io->cmdqs, HINIC_MOD_L2NIC,
IO_CMD_MODIFY_QUEUE_CTXT, &cmdq_buf, IO_CMD_MODIFY_QUEUE_CTXT, &cmdq_buf,
&out_param); &out_param);
if ((err) || (out_param != 0)) { if (err || out_param != 0) {
dev_err(&pdev->dev, "Failed to set RQ ctxts\n"); dev_err(&pdev->dev, "Failed to set RQ ctxts\n");
err = -EFAULT; err = -EFAULT;
} }

4
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
View file

@ -294,7 +294,7 @@ static int msg_to_mgmt_sync(struct hinic_pf_to_mgmt *pf_to_mgmt,
goto unlock_sync_msg; goto unlock_sync_msg;
} }
if ((buf_out) && (recv_msg->msg_len <= MAX_PF_MGMT_BUF_SIZE)) { if (buf_out && recv_msg->msg_len <= MAX_PF_MGMT_BUF_SIZE) {
memcpy(buf_out, recv_msg->msg, recv_msg->msg_len); memcpy(buf_out, recv_msg->msg, recv_msg->msg_len);
*out_size = recv_msg->msg_len; *out_size = recv_msg->msg_len;
} }
@ -411,7 +411,7 @@ static void recv_mgmt_msg_work_handler(struct work_struct *work)
HINIC_MGMT_CB_ENABLED, HINIC_MGMT_CB_ENABLED,
HINIC_MGMT_CB_ENABLED | HINIC_MGMT_CB_RUNNING); HINIC_MGMT_CB_ENABLED | HINIC_MGMT_CB_RUNNING);
if ((cb_state == HINIC_MGMT_CB_ENABLED) && (mgmt_cb->cb)) if (cb_state == HINIC_MGMT_CB_ENABLED && mgmt_cb->cb)
mgmt_cb->cb(mgmt_cb->handle, mgmt_work->cmd, mgmt_cb->cb(mgmt_cb->handle, mgmt_work->cmd,
mgmt_work->msg, mgmt_work->msg_len, mgmt_work->msg, mgmt_work->msg_len,
buf_out, &out_size); buf_out, &out_size);

10
drivers/net/ethernet/huawei/hinic/hinic_port.c
View file

@ -128,7 +128,7 @@ int hinic_port_get_mac(struct hinic_dev *nic_dev, u8 *addr)
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_MAC, err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_MAC,
&port_mac_cmd, sizeof(port_mac_cmd), &port_mac_cmd, sizeof(port_mac_cmd),
&port_mac_cmd, &out_size); &port_mac_cmd, &out_size);
if (err || (out_size != sizeof(port_mac_cmd)) || port_mac_cmd.status) { if (err || out_size != sizeof(port_mac_cmd) || port_mac_cmd.status) {
dev_err(&pdev->dev, "Failed to get mac, err: %d, status: 0x%x, out size: 0x%x\n", dev_err(&pdev->dev, "Failed to get mac, err: %d, status: 0x%x, out size: 0x%x\n",
err, port_mac_cmd.status, out_size); err, port_mac_cmd.status, out_size);
return -EFAULT; return -EFAULT;
@ -263,7 +263,7 @@ int hinic_port_link_state(struct hinic_dev *nic_dev,
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_LINK_STATE, err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_LINK_STATE,
&link_cmd, sizeof(link_cmd), &link_cmd, sizeof(link_cmd),
&link_cmd, &out_size); &link_cmd, &out_size);
if (err || (out_size != sizeof(link_cmd)) || link_cmd.status) { if (err || out_size != sizeof(link_cmd) || link_cmd.status) {
dev_err(&pdev->dev, "Failed to get link state, err: %d, status: 0x%x, out size: 0x%x\n", dev_err(&pdev->dev, "Failed to get link state, err: %d, status: 0x%x, out size: 0x%x\n",
err, link_cmd.status, out_size); err, link_cmd.status, out_size);
return -EINVAL; return -EINVAL;
@ -297,7 +297,7 @@ int hinic_port_set_state(struct hinic_dev *nic_dev, enum hinic_port_state state)
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_SET_PORT_STATE, err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_SET_PORT_STATE,
&port_state, sizeof(port_state), &port_state, sizeof(port_state),
&port_state, &out_size); &port_state, &out_size);
if (err || (out_size != sizeof(port_state)) || port_state.status) { if (err || out_size != sizeof(port_state) || port_state.status) {
dev_err(&pdev->dev, "Failed to set port state, err: %d, status: 0x%x, out size: 0x%x\n", dev_err(&pdev->dev, "Failed to set port state, err: %d, status: 0x%x, out size: 0x%x\n",
err, port_state.status, out_size); err, port_state.status, out_size);
return -EFAULT; return -EFAULT;
@ -329,7 +329,7 @@ int hinic_port_set_func_state(struct hinic_dev *nic_dev,
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_SET_FUNC_STATE, err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_SET_FUNC_STATE,
&func_state, sizeof(func_state), &func_state, sizeof(func_state),
&func_state, &out_size); &func_state, &out_size);
if (err || (out_size != sizeof(func_state)) || func_state.status) { if (err || out_size != sizeof(func_state) || func_state.status) {
dev_err(&pdev->dev, "Failed to set port func state, err: %d, status: 0x%x, out size: 0x%x\n", dev_err(&pdev->dev, "Failed to set port func state, err: %d, status: 0x%x, out size: 0x%x\n",
err, func_state.status, out_size); err, func_state.status, out_size);
return -EFAULT; return -EFAULT;
@ -359,7 +359,7 @@ int hinic_port_get_cap(struct hinic_dev *nic_dev,
err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_CAP, err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_GET_CAP,
port_cap, sizeof(*port_cap), port_cap, sizeof(*port_cap),
port_cap, &out_size); port_cap, &out_size);
if (err || (out_size != sizeof(*port_cap)) || port_cap->status) { if (err || out_size != sizeof(*port_cap) || port_cap->status) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Failed to get port capabilities, err: %d, status: 0x%x, out size: 0x%x\n", "Failed to get port capabilities, err: %d, status: 0x%x, out size: 0x%x\n",
err, port_cap->status, out_size); err, port_cap->status, out_size);

2
drivers/net/ethernet/huawei/hinic/hinic_tx.c
View file

@ -717,7 +717,7 @@ static int free_tx_poll(struct napi_struct *napi, int budget)
/* Reading a WQEBB to get real WQE size and consumer index. */ /* Reading a WQEBB to get real WQE size and consumer index. */
sq_wqe = hinic_sq_read_wqebb(sq, &skb, &wqe_size, &sw_ci); sq_wqe = hinic_sq_read_wqebb(sq, &skb, &wqe_size, &sw_ci);
if ((!sq_wqe) || if (!sq_wqe ||
(((hw_ci - sw_ci) & wq->mask) * wq->wqebb_size < wqe_size)) (((hw_ci - sw_ci) & wq->mask) * wq->wqebb_size < wqe_size))
break; break;