Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 994e04f1 authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: modify hclge_init_client_instance() 



hclge_init_client_instance() is a little bloated and there is
some duplicated code. This patch adds some cleanup for it.

Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25d1817c

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

+53 −37
Original line number Diff line number Diff line
@@ -8169,6 +8169,52 @@ static void hclge_info_show(struct hclge_dev *hdev) 
	dev_info(dev, "PF info end.\n");

}



static int hclge_init_nic_client_instance(struct hnae3_ae_dev *ae_dev,

					  struct hclge_vport *vport)

{

	struct hnae3_client *client = vport->nic.client;

	struct hclge_dev *hdev = ae_dev->priv;

	int ret;



	ret = client->ops->init_instance(&vport->nic);

	if (ret)

		return ret;



	set_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state);

	hnae3_set_client_init_flag(client, ae_dev, 1);



	if (netif_msg_drv(&hdev->vport->nic))

		hclge_info_show(hdev);



	return 0;

}



static int hclge_init_roce_client_instance(struct hnae3_ae_dev *ae_dev,

					   struct hclge_vport *vport)

{

	struct hnae3_client *client = vport->roce.client;

	struct hclge_dev *hdev = ae_dev->priv;

	int ret;



	if (!hnae3_dev_roce_supported(hdev) || !hdev->roce_client ||

	    !hdev->nic_client)

		return 0;



	client = hdev->roce_client;

	ret = hclge_init_roce_base_info(vport);

	if (ret)

		return ret;



	ret = client->ops->init_instance(&vport->roce);

	if (ret)

		return ret;



	set_bit(HCLGE_STATE_ROCE_REGISTERED, &hdev->state);

	hnae3_set_client_init_flag(client, ae_dev, 1);



	return 0;

}



static int hclge_init_client_instance(struct hnae3_client *client,

				      struct hnae3_ae_dev *ae_dev)

{
@@ -8184,34 +8230,14 @@ static int hclge_init_client_instance(struct hnae3_client *client, 


			hdev->nic_client = client;

			vport->nic.client = client;

			ret = client->ops->init_instance(&vport->nic);

			ret = hclge_init_nic_client_instance(ae_dev, vport);

			if (ret)

				goto clear_nic;



			hnae3_set_client_init_flag(client, ae_dev, 1);

			set_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state);



			if (netif_msg_drv(&hdev->vport->nic))

				hclge_info_show(hdev);



			if (hdev->roce_client &&

			    hnae3_dev_roce_supported(hdev)) {

				struct hnae3_client *rc = hdev->roce_client;



				ret = hclge_init_roce_base_info(vport);

				if (ret)

					goto clear_roce;



				ret = rc->ops->init_instance(&vport->roce);

			ret = hclge_init_roce_client_instance(ae_dev, vport);

			if (ret)

				goto clear_roce;



				set_bit(HCLGE_STATE_ROCE_REGISTERED,

					&hdev->state);

				hnae3_set_client_init_flag(hdev->roce_client,

							   ae_dev, 1);

			}



			break;

		case HNAE3_CLIENT_UNIC:

			hdev->nic_client = client;
@@ -8230,20 +8256,10 @@ static int hclge_init_client_instance(struct hnae3_client *client, 
				vport->roce.client = client;

			}



			if (hdev->roce_client && hdev->nic_client) {

				ret = hclge_init_roce_base_info(vport);

			ret = hclge_init_roce_client_instance(ae_dev, vport);

			if (ret)

				goto clear_roce;



				ret = client->ops->init_instance(&vport->roce);

				if (ret)

					goto clear_roce;



				set_bit(HCLGE_STATE_ROCE_REGISTERED,

					&hdev->state);

				hnae3_set_client_init_flag(client, ae_dev, 1);

			}



			break;

		default:

			return -EINVAL;