From patchwork Wed Sep 21 16:55:19 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: 9343933 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 7BBCC607D4 for ; Wed, 21 Sep 2016 16:55:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BA5E29DE6 for ; Wed, 21 Sep 2016 16:55:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6DA982A796; Wed, 21 Sep 2016 16:55:29 +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 02FE429DE6 for ; Wed, 21 Sep 2016 16:55:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 50FA56E87B; Wed, 21 Sep 2016 16:55:28 +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.4]) by gabe.freedesktop.org (Postfix) with ESMTPS id 616F86E87B for ; Wed, 21 Sep 2016 16:55:26 +0000 (UTC) Received: from [192.168.1.2] ([77.182.212.253]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0MfHUw-1bbFFy2dWE-00Okvn; Wed, 21 Sep 2016 18:55:20 +0200 Subject: [PATCH 13/14] GPU-DRM-OMAP: Rename a jump label in omap_gem_new_dmabuf() 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: <48e87ab8-a85f-ca51-ebac-bb6f6012fbcc@users.sourceforge.net> Date: Wed, 21 Sep 2016 18:55:19 +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:mxz94ztOEQS/UY0NzEP5BVZSywMhTI6TIxtJoO7prZnahx8wCKc iWK91DPS08/d1K54OZGeP38U/x1w4/qijqyes715mZIZH3MDIsv1R76wiqQ5sHIunNBCycF IqTfRKIaglU3x1gutu+QhYrBA6BJHuI//kMzGy39GGJVGcAHZ4vB4usuKJKJfiW0kytnnmW kfxOY5vgzUW+kdX4HQdvg== X-UI-Out-Filterresults: notjunk:1; V01:K0:mVwNfe2jdgw=:Z68zM/j4jMG5C9tujlBF6N vQlcasEqXx8yZMq2sAq30nTCWKlezWex696cdspOtccJDbWuEE1B9SaHJy4wuDM+jwuQPtWG4 Cg5YnTa3QRXKGGE59ZgnXOzgFzl2LRn11xk2Az/MvXFBH3OecqmOf4m/ZRtj0NYUfDcz+Rh5K aXc6he690LuW8xGtdbsTNSU7ewQsDNDuVCdu6rfI2eS0L69zkuVkVfVNJT6bO8SaNydKsdZpB 0rkL3/UflMANJe50DNbhwQNswG3S0Q/1g63TDNuikxzrKVSTOvh9r3fo6n8Dcz/x1BA7Zj7v+ o4n4LiOabNSlg7J41NO/0bWs9DfxoudUIsiH/PwEc5AHx+f/RFfagSJiaLZNUbDpmjYhJORtC 0QH4dix8FCyW61L4Pdq9o+qm6BGtp9/JnlaLDrkVeuPPSx+jqhZMlTqJxMfuo8+SE+wPtJkTU OYd9Jx69B5sEZBEj+47zmTl0+buDjsrtzLbb/RKGxG9OGSjewnGLMkNJn4bg9vubrOuTIq7x9 NpOiv0iGSjZ+As/0vZKtXKZsa1hoF0oaFEIU5p1cFenv/TZo4Gd8wOg04QEN7JHAbaYOz7sHP QFTXaFDJskEmWzQN7UPP5nkDE0zAs4uOuUIgdMsFQcpF763SkoKTdxLb6HRdddRpLFpSmKmwr dNuLi58NlDZICALxbKf8spHbUK0XnP0Ot067YDuPqN/D/YmGKoP0OXqtDuVoq96lnYM4bssbz l4xHIoWoReCqnLmCFwwMq2/HLgQvQYFWzXG6/qMghGncSB5LKDnDYcGzEPnEl3nQ3NtS65zyv Re+zmwE 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:45:04 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/gpu/drm/omapdrm/omap_gem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 3c49ad9..92510de 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -1442,7 +1442,7 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size, obj = omap_gem_new(dev, gsize, OMAP_BO_MEM_DMABUF | OMAP_BO_WC); if (!obj) { obj = ERR_PTR(-ENOMEM); - goto done; + goto unlock; } omap_obj = to_omap_bo(obj); @@ -1462,7 +1462,7 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size, if (!pages) { omap_gem_free_object(obj); obj = ERR_PTR(-ENOMEM); - goto done; + goto unlock; } omap_obj->pages = pages; @@ -1476,11 +1476,10 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size, if (WARN_ON(i != npages)) { omap_gem_free_object(obj); obj = ERR_PTR(-ENOMEM); - goto done; + goto unlock; } } - -done: + unlock: mutex_unlock(&dev->struct_mutex); return obj; }