From patchwork Wed Feb 8 21:23:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9563463 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 29146601C3 for ; Wed, 8 Feb 2017 21:23:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AE47284D8 for ; Wed, 8 Feb 2017 21:23:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DCD4284FF; Wed, 8 Feb 2017 21:23:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0735F284D8 for ; Wed, 8 Feb 2017 21:23:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751756AbdBHVXh (ORCPT ); Wed, 8 Feb 2017 16:23:37 -0500 Received: from mout.web.de ([212.227.15.4]:54916 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751155AbdBHVXg (ORCPT ); Wed, 8 Feb 2017 16:23:36 -0500 Received: from [192.168.1.2] ([77.181.90.255]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M1lTm-1cH9RW1KMk-00tkp5; Wed, 08 Feb 2017 22:23:24 +0100 Subject: [PATCH 13/14] RDMA/cxgb4: Rename jump labels in c4iw_create_qp() To: linux-rdma@vger.kernel.org, Doug Ledford , Hal Rosenstock , Sean Hefty , Steve Wise References: <0aff92fa-2891-333a-2e1e-ca309db2ec72@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <8f233488-a0fd-7f64-012d-d0281f02624a@users.sourceforge.net> Date: Wed, 8 Feb 2017 22:23:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <0aff92fa-2891-333a-2e1e-ca309db2ec72@users.sourceforge.net> X-Provags-ID: V03:K0:d8OIs9njMXUs9brBREU8+9TJ9U+XT2BIwTloLhyPR1cvDfaHh4X oE1A3vWUUocreA/TFOia21sTDZQPerRKTPnD/+nMQdcmdhTFEOIP4efxCKo8PrTphfvJHIc dpISYndLpxc7/OvBQUzx7iJDFNIHigGrExkPfS2xhn6lSWbJqmhf6ppPsq6WI/ifp8bhw/e Ap87thXSVy5k1aQKiGTlw== X-UI-Out-Filterresults: notjunk:1; V01:K0:yIBQZAb9zTA=:ZjYMyKE7JEZ16kGxj3Xu3A 7zYmJVhrk8axf9dxtxTHnWn3TBy/dScF+MgEyfOTyosEehq601gizosbNEMBurtVMrRT32EwJ 4N9JEFICUUqY8j2JHL4iY4YXXKhdXBVCyg9zjninJVug/42WIyEa9Y6rExab6DSkURdq/Akgy Q64rezsS+HQyByw3Af9BzkVhF4C0jjug60XSDZn0uwRoaL4enN9cHNFjFXjhM0IeNe0XUvf8J Rg/NsNdvkhKMotVlooxbhXlxuO38ti4mcH33XLxrlYGsGts7qOkJpG8fpoHQiE3KyO6F8DpCm bnaxAAyQm+9wMCBE9Ka3mJsjNYMqcAoeZKk+b9p2DqhIEq9P42mIcG1gLmEUIuLh27fwITv9D WSBtCS5jGHRwOARkJUoSqCOzyADVxhOjR/HR/gGMsZfQw/c9aRpg4Tw6Im+Obsr+z9qkNbwlL z+pS7pMItL4X5AioxGulNHuwngf5Wa6ZSfD9yGCuKJq//gCEqPefNHQDkAwJXkzKcshuH3mP4 uvfZ0RHnEQzLtey1WxCMPsA4FT5c9L823K9hgloS+pnKL0ACRbo+LLrQF16PQTLPtQ9qFpaH7 JdWfCrD22+co4NLY9u48zmbIiU07zSz9zGP9WjAToaWNt5fRgCHB0hCEzX/Do7Pye54gLIE+U FA1IGbiE0zqkTwkeBLB1oCrzZFemN7WNXmRedBjzNiPaukZ9DE6v+CTZ6rJDG0KOTpXYVyMjE 4N2vJwn2gwU389stIE4p86Jum1lOR8nE2nzuM0UYFo7CE6wptYchs1ZPFAWqOGSXojJL4UbtW Jqedy79 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Wed, 8 Feb 2017 21:12:26 +0100 Adjust jump labels according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/infiniband/hw/cxgb4/qp.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c index ac63b1f70731..c278b1d968b0 100644 --- a/drivers/infiniband/hw/cxgb4/qp.c +++ b/drivers/infiniband/hw/cxgb4/qp.c @@ -1817,7 +1817,7 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, ret = create_qp(&rhp->rdev, &qhp->wq, &schp->cq, &rchp->cq, ucontext ? &ucontext->uctx : &rhp->rdev.uctx); if (ret) - goto err1; + goto free_qhp; attrs->cap.max_recv_wr = rqsize - 1; attrs->cap.max_send_wr = sqsize - 1; @@ -1848,35 +1848,35 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, ret = insert_handle(rhp, &rhp->qpidr, qhp, qhp->wq.sq.qid); if (ret) - goto err2; + goto destroy_qp; if (udata) { sq_key_mm = kmalloc(sizeof(*sq_key_mm), GFP_KERNEL); if (!sq_key_mm) { ret = -ENOMEM; - goto err3; + goto remove_handle; } rq_key_mm = kmalloc(sizeof(*rq_key_mm), GFP_KERNEL); if (!rq_key_mm) { ret = -ENOMEM; - goto err4; + goto free_sq_key; } sq_db_key_mm = kmalloc(sizeof(*sq_db_key_mm), GFP_KERNEL); if (!sq_db_key_mm) { ret = -ENOMEM; - goto err5; + goto free_rq_key; } rq_db_key_mm = kmalloc(sizeof(*rq_db_key_mm), GFP_KERNEL); if (!rq_db_key_mm) { ret = -ENOMEM; - goto err6; + goto free_sq_db_key; } if (t4_sq_onchip(&qhp->wq.sq)) { ma_sync_key_mm = kmalloc(sizeof(*ma_sync_key_mm), GFP_KERNEL); if (!ma_sync_key_mm) { ret = -ENOMEM; - goto err7; + goto free_rq_db_key; } uresp.flags = C4IW_QPF_ONCHIP; } else @@ -1906,7 +1906,7 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, spin_unlock(&ucontext->mmap_lock); ret = ib_copy_to_udata(udata, &uresp, sizeof uresp); if (ret) - goto err8; + goto free_ma_sync_key; sq_key_mm->key = uresp.sq_key; sq_key_mm->addr = qhp->wq.sq.phys_addr; sq_key_mm->len = PAGE_ALIGN(qhp->wq.sq.memsize); @@ -1944,22 +1944,22 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, attrs->cap.max_send_wr, qhp->wq.rq.qid, qhp->wq.rq.size, qhp->wq.rq.memsize, attrs->cap.max_recv_wr); return &qhp->ibqp; -err8: +free_ma_sync_key: kfree(ma_sync_key_mm); -err7: +free_rq_db_key: kfree(rq_db_key_mm); -err6: +free_sq_db_key: kfree(sq_db_key_mm); -err5: +free_rq_key: kfree(rq_key_mm); -err4: +free_sq_key: kfree(sq_key_mm); -err3: +remove_handle: remove_handle(rhp, &rhp->qpidr, qhp->wq.sq.qid); -err2: +destroy_qp: destroy_qp(&rhp->rdev, &qhp->wq, ucontext ? &ucontext->uctx : &rhp->rdev.uctx); -err1: +free_qhp: kfree(qhp); return ERR_PTR(ret); }