From patchwork Wed Sep 21 16:49:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9343907 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 D2ACA6077A for ; Wed, 21 Sep 2016 16:50:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4D662A766 for ; Wed, 21 Sep 2016 16:50:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9E0C2A789; Wed, 21 Sep 2016 16:50:00 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4D4372A76A for ; Wed, 21 Sep 2016 16:50:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7FD176E872; Wed, 21 Sep 2016 16:49:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.web.de (mout.web.de [212.227.15.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 185AA6E872 for ; Wed, 21 Sep 2016 16:49:57 +0000 (UTC) Received: from [192.168.1.2] ([77.182.212.253]) by smtp.web.de (mrweb004) with ESMTPSA (Nemesis) id 0Mg1Nl-1baz9p3Wez-00NPnQ; Wed, 21 Sep 2016 18:49:52 +0200 Subject: [PATCH 08/14] GPU-DRM-OMAP: Rename a jump label in dmm_txn_commit() To: dri-devel@lists.freedesktop.org, David Airlie , Laurent Pinchart , Tomi Valkeinen References: <566ABCD9.1060404@users.sourceforge.net> <0ea38611-3d93-0ade-a1fb-f8cc2e0b8d61@users.sourceforge.net> From: SF Markus Elfring Message-ID: <7d47650b-b911-8225-c9ec-a08112073a31@users.sourceforge.net> Date: Wed, 21 Sep 2016 18:49:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <0ea38611-3d93-0ade-a1fb-f8cc2e0b8d61@users.sourceforge.net> X-Provags-ID: V03:K0:q46kx0TMyac2dBh28Vog3Zc7j+4Aotr/fC/yRQ63NbPs5apUz9R +Wc3B1zU//2KFMh5L7FJ63o+nYmxpHbOy4MuLKTRWG98LbmBrv9WAx1qTJ/75k+OQ4t043h z5674otoRVNRVhy89fmJIE5jUypYa8agEeWG49DzWp2lvLuontsUX+di3BJ9ecMUAS2UQEf zaQxDofz5oKEVFQMn9trw== X-UI-Out-Filterresults: notjunk:1; V01:K0:DxfAavFJe8c=:02vP0ALboOPf11+0ycaIag JOYZwe/NRew8WqBvE7YGt2JDrNKBtvRnkWlnErgXlYh5MPnYLpX2rld4Y9qxC87EifJ/9/oQt wGBaCzVzHWWvL0B8TrHtE980xUixBQGsfS7F8MuEQuSjiauFYZzshSZMOT/shN33onBrh+W6F V9vjl0rHRQCSBUY1f+zAyJwWQ3LAGh9/vnVnU056jQ/uEOtbBGURUNdGh3ja5k/aYNBuOYenQ 0RhRnzenyJDKoCPFHRqaWPkEqGDNFetbnk8YjIx689s6uqrQMcPwM0FGAIy435SyqVRsm7kJ2 2MS/1MjVTaclPTo73K1gmtdujLGBNt4KCOZYWIR3YmRPjs60hEU0gjiTJ94lhnRXi2qMME9rd r31rx4wnFCNwtPLlw4DesfPjbjKzEYw8+KyU95lKYrYt8dtWNBzkeqty8hQEombQvDP1Cee6B /HiLkVtpAYuz5Musz+OcGgWZGt/ex7EYvaOJUZvLCYkA1B2q27Ej8CK8c0stjRdapLDKUuKdE P4Njy2X60Siypq2JLNx8RE8Ov4rBv0ZO1oGv7oGzv0jie6unuxl9nCtO26G7XHODek8SR8quw b0uCw25XQdiauKD0sUg18bksEckanED/P+wO5IY190unda8DOHaElCG7FmS2rYvtU8cFgRym9 MUosOR3rWMw/jHi74th3YxTdwO+969DcexWNCL9Nl8NyicafSFYUSRAPIjuQdhfXa/6HisiPA hklm9mbZSFkrblr15a4H8YKe/Dl5j/BwPhWvalGEMQ8dE9ZqeKT8nMDK9WlqsaC7jjVhF5sFp nxDAyez Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Wed, 21 Sep 2016 17:32:42 +0200 Adjust a jump target so that redundant checks can be avoided at the end. Signed-off-by: Markus Elfring --- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c index 5f6f21b..c8ced158 100644 --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c @@ -269,7 +269,7 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) if (!txn->last_pat) { dev_err(engine->dmm->dev, "need at least one txn\n"); ret = -EINVAL; - goto cleanup; + goto release_engine; } txn->last_pat->next_pa = 0; @@ -281,7 +281,7 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) ret = wait_status(engine, DMM_PATSTATUS_READY); if (ret) { ret = -EFAULT; - goto cleanup; + goto release_engine; } /* mark whether it is async to denote list management in IRQ handler */ @@ -301,9 +301,9 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) } } -cleanup: /* only place engine back on list if we are done with it */ if (ret || wait) + release_engine: release_engine(engine); return ret;