Commit 0d59c95e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hinic-cleanups' 



Guangbin Huang says:

====================
net: hinic: some cleanups

This patchset adds some cleanups for the hinic ethernet driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d38717af 5db8c86e

drivers/net/ethernet/huawei/hinic/hinic_ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,6 @@ static void hinic_diag_test(struct net_device *netdev, 
	err = hinic_port_link_state(nic_dev, &link_state);

	if (!err && link_state == HINIC_LINK_STATE_UP)

		netif_carrier_on(netdev);



}



static int hinic_set_phys_id(struct net_device *netdev,

drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = 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 |=

						HINIC_SAVED_DATA_SET(1, ARM);

	else

drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c

+5 −5
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int init_fw_ctxt(struct hinic_hwdev *hwdev) 
	err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_FWCTXT_INIT,

				 &fw_ctxt, sizeof(fw_ctxt),

				 &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",

			err, fw_ctxt.status, out_size);

		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,

				 &cmd_base_qpn, sizeof(cmd_base_qpn),

				 &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",

			err, cmd_base_qpn.status, out_size);

		return -EIO;
@@ -605,8 +605,8 @@ static void nic_mgmt_msg_handler(void *handle, u8 cmd, void *buf_in, 
	hwif = hwdev->hwif;

	pdev = hwif->pdev;



	if ((cmd < HINIC_MGMT_MSG_CMD_BASE) ||

	    (cmd >= HINIC_MGMT_MSG_CMD_MAX)) {

	if (cmd < HINIC_MGMT_MSG_CMD_BASE ||

	    cmd >= HINIC_MGMT_MSG_CMD_MAX) {

		dev_err(&pdev->dev, "unknown L2NIC event, cmd = %d\n", cmd);

		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_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,

				in_size, buf_out, out_size);

	else

drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c

+3 −3
Original line number Diff line number Diff line
@@ -254,8 +254,8 @@ static void aeq_irq_handler(struct hinic_eq *eq) 
					    HINIC_EQE_ENABLED,

					    HINIC_EQE_ENABLED |

					    HINIC_EQE_RUNNING);

			if ((eqe_state == HINIC_EQE_ENABLED) &&

			    (hwe_cb->hwe_handler))

			if (eqe_state == HINIC_EQE_ENABLED &&

			    hwe_cb->hwe_handler)

				hwe_cb->hwe_handler(hwe_cb->handle,

						    aeqe_curr->data, size);

			else
@@ -299,7 +299,7 @@ static void ceq_event_handler(struct hinic_ceqs *ceqs, u32 ceqe) 
			    HINIC_EQE_ENABLED,

			    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));

	else

		dev_err(&pdev->dev, "Unhandled CEQ Event %d\n", event);

drivers/net/ethernet/huawei/hinic/hinic_hw_if.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static void __print_selftest_reg(struct hinic_hwif *hwif) 
/**

 * hinic_init_hwif - initialize the hw interface

 * @hwif: the HW interface of a pci function device

 * @pdev: the pci device for acessing PCI resources

 * @pdev: the pci device for accessing PCI resources

 *

 * Return 0 - Success, negative - Failure

 **/