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

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>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 46435c85b16032e29a163ef7386f501513b60940..46e030c41fe94baa3fa674748e2fa88c26f37381 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -5297,7 +5297,7 @@ static int hclge_init_client_instance(struct hnae3_client *client,
                        vport->nic.client = client;
                        ret = client->ops->init_instance(&vport->nic);
                        if (ret)
-                               goto err;
+                               return ret;
 
                        if (hdev->roce_client &&
                            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);
                                if (ret)
-                                       goto err;
+                                       return ret;
 
                                ret = rc->ops->init_instance(&vport->roce);
                                if (ret)
-                                       goto err;
+                                       return ret;
                        }
 
                        break;
@@ -5319,7 +5319,7 @@ static int hclge_init_client_instance(struct hnae3_client *client,
 
                        ret = client->ops->init_instance(&vport->nic);
                        if (ret)
-                               goto err;
+                               return ret;
 
                        break;
                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) {
                                ret = hclge_init_roce_base_info(vport);
                                if (ret)
-                                       goto err;
+                                       return ret;
 
                                ret = client->ops->init_instance(&vport->roce);
                                if (ret)
-                                       goto err;
+                                       return ret;
                        }
                }
        }
 
        return 0;
-err:
-       return ret;
 }
 
 static void hclge_uninit_client_instance(struct hnae3_client *client,