On Fri, Jul 22, 2016 at 11:50 AM, SF Markus Elfring
<elfring@xxxxxxxxxxxxxxxxxxxxx> wrote:
> From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> Date: Fri, 22 Jul 2016 16:51:00 +0200
>
> Adjust jump targets according to the Linux coding style convention.
>
I'm not convinced the old labels are really that bad, tbh.
Sean
> Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> ---
> 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
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
