leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: hns3: cleanup of return values in hclge_init_client_instance()

Browse Source 
Removes the goto and directly returns in case of errors as part of the
cleanup.

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jian Shen 2018-05-19 16:53:17 +01:00 committed by David S. Miller
parent e63cd65f43
commit 99a6993a69
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
View File

@ -5297,7 +5297,7 @@ static int hclge_init_client_instance(struct hnae3_client *client,
vport->nic.client = client; vport->nic.client = client;
ret = client->ops->init_instance(&vport->nic); ret = client->ops->init_instance(&vport->nic);
if (ret) if (ret)
goto err; return ret;
if (hdev->roce_client && if (hdev->roce_client &&
hnae3_dev_roce_supported(hdev)) { hnae3_dev_roce_supported(hdev)) {
@ -5305,11 +5305,11 @@ static int hclge_init_client_instance(struct hnae3_client *client,
ret = hclge_init_roce_base_info(vport); ret = hclge_init_roce_base_info(vport);
if (ret) if (ret)
goto err; return ret;
ret = rc->ops->init_instance(&vport->roce); ret = rc->ops->init_instance(&vport->roce);
if (ret) if (ret)
goto err; return ret;
} }
break; break;
@ -5319,7 +5319,7 @@ static int hclge_init_client_instance(struct hnae3_client *client,
ret = client->ops->init_instance(&vport->nic); ret = client->ops->init_instance(&vport->nic);
if (ret) if (ret)
goto err; return ret;
break; break;
case HNAE3_CLIENT_ROCE: case HNAE3_CLIENT_ROCE:
@ -5331,18 +5331,16 @@ static int hclge_init_client_instance(struct hnae3_client *client,
if (hdev->roce_client && hdev->nic_client) { if (hdev->roce_client && hdev->nic_client) {
ret = hclge_init_roce_base_info(vport); ret = hclge_init_roce_base_info(vport);
if (ret) if (ret)
goto err; return ret;
ret = client->ops->init_instance(&vport->roce); ret = client->ops->init_instance(&vport->roce);
if (ret) if (ret)
goto err; return ret;
} }
} }
} }
return 0; return 0;
err:
return ret;
} }
static void hclge_uninit_client_instance(struct hnae3_client *client, static void hclge_uninit_client_instance(struct hnae3_client *client,