From patchwork Fri Aug 4 01:27:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxian Huang X-Patchwork-Id: 130922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1532244vqx; Thu, 3 Aug 2023 19:27:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdsBdlOxr4/pwURze6S2uUmZ+tAMQh8yr3QH4jE05IUaywxF7K1EP5XxyiZQJCWQ83Zf0P X-Received: by 2002:a05:6402:348b:b0:523:f69:9a0d with SMTP id v11-20020a056402348b00b005230f699a0dmr2499548edc.4.1691116021674; Thu, 03 Aug 2023 19:27:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691116021; cv=none; d=google.com; s=arc-20160816; b=hEADm+NXrYi34T+YrOMvQNpNI+DAOGYnHEyy2NdmsmNvvkFcPcRDgjcD7U1gsIlwwz iyU/Fr1Vnnmg2/qoJKMFWXsovGlOFLkoHMESFGM5x9xLQW0KFKDqPTjIzUZHXN/ZG1Up 8m9RKFd6rd1Qza01PfYdcDk+kBN1CZ87uCAJu5I/pHAeyBfEBM3WhcpgULLMN8Jp2I84 Mo3pySnNOJnrNKFVP4oCwE6wq31o89xMZE25IClo5tUIGsPzfxhdvjjV1Lf5SEDF4V5I m9kj2oGmQd1TzWlvVqHi08AsW4DJdZ1bae1Wsm4cOpZnMZ2MRANF6f5o11HRRGLDrJAh rn5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=8WkgldsjNJj0OWIKl0mYl+mIaTFrQm5ZlDGZyXiOezY=; fh=3H3oLXANh5v13tjHxrBYuXblpWbB01kHKe+fQJ1oJi8=; b=zOSMf1Cr1+MGNtYevCDx0OvtFDJgyI6kLG/NCya0gVxnYAdc+OndLqw8q15UAx4d5q z8d07b7CjAwf2Kh3u/hLx/ptU+uHl08D26NOuR+WMNTxlsoA6tCaEHn/4sM+/XkBH1Hs Ia9YAecWPzNPtgbyI4tAEkJfhPMt0SjHKQR/dBQMEXemdrX48JT3/rJTV799t2F0hTSY hLGMa5e6G9bpQPp0IL9TJipfAMKdKVcOJTcWVS41Ez4/iJQt1LLympwu5EdMAwj9qUGW J8e9Xa/3ma+IEXzwtX9tWkllmntS6mA2tz1T4BGxyeFQoytnKNsn7Rms4rOypXmo/6C2 Hadw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c3-20020aa7d603000000b0052257d64ad2si784486edr.269.2023.08.03.19.26.37; Thu, 03 Aug 2023 19:27:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232491AbjHDBaH (ORCPT + 99 others); Thu, 3 Aug 2023 21:30:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231942AbjHDB3y (ORCPT ); Thu, 3 Aug 2023 21:29:54 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44B574482; Thu, 3 Aug 2023 18:29:53 -0700 (PDT) Received: from kwepemi500006.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RH7Qk5nMXzrS0X; Fri, 4 Aug 2023 09:28:46 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemi500006.china.huawei.com (7.221.188.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 4 Aug 2023 09:29:51 +0800 From: Junxian Huang To: , CC: , , , Subject: [PATCH for-rc 3/4] RDMA/hns: Fix inaccurate error label name in init instance Date: Fri, 4 Aug 2023 09:27:10 +0800 Message-ID: <20230804012711.808069-4-huangjunxian6@hisilicon.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230804012711.808069-1-huangjunxian6@hisilicon.com> References: <20230804012711.808069-1-huangjunxian6@hisilicon.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500006.china.huawei.com (7.221.188.68) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773263673123190145 X-GMAIL-MSGID: 1773263673123190145 This patch fixes inaccurate error label name in init instance. Fixes: 70f92521584f ("RDMA/hns: Use the reserved loopback QPs to free MR before destroying MPT") Signed-off-by: Junxian Huang --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index f95551b6d407..1d998298e28f 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -6723,14 +6723,14 @@ static int __hns_roce_hw_v2_init_instance(struct hnae3_handle *handle) ret = hns_roce_init(hr_dev); if (ret) { dev_err(hr_dev->dev, "RoCE Engine init failed!\n"); - goto error_failed_cfg; + goto error_failed_roce_init; } if (hr_dev->pci_dev->revision == PCI_REVISION_ID_HIP08) { ret = free_mr_init(hr_dev); if (ret) { dev_err(hr_dev->dev, "failed to init free mr!\n"); - goto error_failed_roce_init; + goto error_failed_free_mr_init; } } @@ -6738,10 +6738,10 @@ static int __hns_roce_hw_v2_init_instance(struct hnae3_handle *handle) return 0; -error_failed_roce_init: +error_failed_free_mr_init: hns_roce_exit(hr_dev); -error_failed_cfg: +error_failed_roce_init: kfree(hr_dev->priv); error_failed_kzalloc: