From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH 3/4] GPU-DRM-Etnaviv: Rename jump labels Date: Fri, 22 Jul 2016 17:50:04 +0200 Message-ID: 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> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <00ca5af9-674a-73ce-b423-1ce41d426942@users.sourceforge.net> Sender: linux-kernel-owner@vger.kernel.org To: dri-devel@lists.freedesktop.org, Christian Gmeiner , David Airlie , Lucas Stach , Russell King Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall List-Id: dri-devel@lists.freedesktop.org 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); } -- 2.9.2