From patchwork Fri Jul 22 15:50:04 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: 9243813 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 6928E60756 for ; Fri, 22 Jul 2016 15:50:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B3B126246 for ; Fri, 22 Jul 2016 15:50:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5015A27FA7; Fri, 22 Jul 2016 15:50:25 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE61526246 for ; Fri, 22 Jul 2016 15:50:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D47E66EBF2; Fri, 22 Jul 2016 15:50:21 +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.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3EF9F6EBF2 for ; Fri, 22 Jul 2016 15:50:18 +0000 (UTC) Received: from [192.168.1.2] ([77.182.75.73]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0LoHP7-1apfGe3Cxt-00gKD0; Fri, 22 Jul 2016 17:50:05 +0200 Subject: [PATCH 3/4] GPU-DRM-Etnaviv: Rename jump labels To: dri-devel@lists.freedesktop.org, Christian Gmeiner , David Airlie , Lucas Stach , Russell King References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <00ca5af9-674a-73ce-b423-1ce41d426942@users.sourceforge.net> From: SF Markus Elfring Message-ID: Date: Fri, 22 Jul 2016 17:50:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <00ca5af9-674a-73ce-b423-1ce41d426942@users.sourceforge.net> X-Provags-ID: V03:K0:G2ah+OBjuBGMBAP21CovQ1whGMnv3KHfudI6L6+wTaDK32jV4ZG b1xx0JI6n42K4R1qjlUHI2DYb7w9eCOi/jxJR8ZkZMIV17lyn0f7gbJOvOYv08JJv2iukXG 85zVWydByy+QdKgzaG5kbRJlGgIDJeoAwaVnoBIDd/cMpwSkXkcXtoja22g8sFz/iBoDDVC /YD9/etlRap2z4LEyLvTA== X-UI-Out-Filterresults: notjunk:1; V01:K0:hp+Ca3ZP/h0=:8zOy+rCsurj9Ka7cXYPQMr kanfinuXX5W324UBmwzqrIAEw494ED84cjaF+Eu6oB/g45wW5zJblmA0NutipYimVcqLWvLW+ +d7mo++EXelWi2HnrrOKc2o8WU9lhzepHCYsveAzXPNLmel2CSvOB9udS1lqKIkFS8CUq0//S X21seMFbtUpb4tDPT/yXPHKcOxnW//VVpudCecywmbj27p2JOmJp9BdiDz+TUM/bAF8XgZYiv xcfe4KCpBsWL/I+5qAov0OQB7Ana/d3f5RpFjZEZsObb8otARQHOW54PIX7j/LYJ6VkerWtKb 075C5bpY/3NgrqCnkQxAxJvTazWR+DPSNLLC3PVc4A7yY3SzHz5Hl+Wumt6TebL5oT4LNtpCI GfdvMQ123+z0L+AZZ60XcGwOWp5EXAzVuCYDMNsU4oxkhm2i3VXYw9/A43Els/YWMmnQknInP iSXeKlS4OUbgslsDuTogAAoqpDLhkCrpaJFi04ydT0d3IzyLatqt/zTZ2T+0mRUeINhCNtjaW M3WCCAoTt/Zn6n79hnJW4GHnbsGcUXb7ToU1DQaYBXAFxez1RlXj8AvNIz07F0PTSFRa3Keec J9AqV15tQzNPALaNzintUCZAtqTs2Ozh3uD8XUJ/PYRNPavX5O2y6p4QIyZpTxiQGXL2Ckqif YBM6gE5YsSfhWdbq5c5YsKKUduT3iKDdn0OLbBQnBIKqv+tPzTXfcpA6gU1m2Hj6Ij2B2PhEk eOfYVqO5J3JH0N8oeHXSjEasPuAyRcg2Lp0jSBlRKX+KH1jtHbHMMFLOsdFHxOnsOnnDVPQG/ dM1R1j+ 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: Fri, 22 Jul 2016 16:51:00 +0200 Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 851a8ba..0a5c00c 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -308,17 +308,17 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get( mapping = NULL; mutex_unlock(&gpu->mmu->lock); if (mapping) - goto out; + goto unlock; } else { mapping->use += 1; - goto out; + goto unlock; } } pages = etnaviv_gem_get_pages(etnaviv_obj); if (IS_ERR(pages)) { ret = PTR_ERR(pages); - goto out; + goto unlock; } /* @@ -330,7 +330,7 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get( mapping = kzalloc(sizeof(*mapping), GFP_KERNEL); if (!mapping) { ret = -ENOMEM; - goto out; + goto unlock; } INIT_LIST_HEAD(&mapping->scan_node); @@ -349,7 +349,7 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get( else list_add_tail(&mapping->obj_node, &etnaviv_obj->vram_list); -out: +unlock: mutex_unlock(&etnaviv_obj->lock); if (ret) @@ -646,7 +646,7 @@ static struct drm_gem_object *__etnaviv_gem_new(struct drm_device *dev, ret = etnaviv_gem_new_impl(dev, size, flags, NULL, &etnaviv_gem_shmem_ops, &obj); if (ret) - goto fail; + goto unreference; ret = drm_gem_object_init(dev, obj, size); if (ret == 0) { @@ -664,7 +664,7 @@ static struct drm_gem_object *__etnaviv_gem_new(struct drm_device *dev, return obj; } -fail: +unreference: drm_gem_object_unreference_unlocked(obj); return ERR_PTR(ret); }