drm/tegra: remove _unlocked suffix in drm_gem_object_put_unlocked

Spelling out _unlocked for each and every driver is a annoying.
Especially if we consider how many drivers, do not know (or need to)
about the horror stories involving struct_mutex.

Just drop the suffix. It makes the API cleaner.

Done via the following script:

__from=drm_gem_object_put_unlocked
__to=drm_gem_object_put
for __file in $(git grep --name-only $__from); do
  sed -i  "s/$__from/$__to/g" $__file;
done

Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-32-emil.l.velikov@gmail.com

diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index d4f51b5..09d71c9 100644 (file)
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -328,7 +328,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
 
 fail:
        while (num_refs--)
-               drm_gem_object_put_unlocked(refs[num_refs]);
+               drm_gem_object_put(refs[num_refs]);
 
        kfree(refs);
 
@@ -368,7 +368,7 @@ static int tegra_gem_mmap(struct drm_device *drm, void *data,
 
        args->offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
 
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
 
        return 0;
 }
@@ -636,7 +636,7 @@ static int tegra_gem_set_tiling(struct drm_device *drm, void *data,
        bo->tiling.mode = mode;
        bo->tiling.value = value;
 
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
 
        return 0;
 }
@@ -676,7 +676,7 @@ static int tegra_gem_get_tiling(struct drm_device *drm, void *data,
                break;
        }
 
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
 
        return err;
 }
@@ -701,7 +701,7 @@ static int tegra_gem_set_flags(struct drm_device *drm, void *data,
        if (args->flags & DRM_TEGRA_GEM_BOTTOM_UP)
                bo->flags |= TEGRA_BO_BOTTOM_UP;
 
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
 
        return 0;
 }
@@ -723,7 +723,7 @@ static int tegra_gem_get_flags(struct drm_device *drm, void *data,
        if (bo->flags & TEGRA_BO_BOTTOM_UP)
                args->flags |= DRM_TEGRA_GEM_BOTTOM_UP;
 
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index 2b0666a..01939c5 100644 (file)
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -171,7 +171,7 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
 
 unreference:
        while (i--)
-               drm_gem_object_put_unlocked(&planes[i]->gem);
+               drm_gem_object_put(&planes[i]->gem);
 
        return ERR_PTR(err);
 }
@@ -235,7 +235,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
        info = drm_fb_helper_alloc_fbi(helper);
        if (IS_ERR(info)) {
                dev_err(drm->dev, "failed to allocate framebuffer info\n");
-               drm_gem_object_put_unlocked(&bo->gem);
+               drm_gem_object_put(&bo->gem);
                return PTR_ERR(info);
        }
 
@@ -244,7 +244,7 @@ static int tegra_fbdev_probe(struct drm_fb_helper *helper,
                err = PTR_ERR(fbdev->fb);
                dev_err(drm->dev, "failed to allocate DRM framebuffer: %d\n",
                        err);
-               drm_gem_object_put_unlocked(&bo->gem);
+               drm_gem_object_put(&bo->gem);
                return PTR_ERR(fbdev->fb);
        }
 

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 6237681..723df14 100644 (file)
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -24,7 +24,7 @@ static void tegra_bo_put(struct host1x_bo *bo)
 {
        struct tegra_bo *obj = host1x_to_tegra_bo(bo);
 
-       drm_gem_object_put_unlocked(&obj->gem);
+       drm_gem_object_put(&obj->gem);
 }
 
 /* XXX move this into lib/scatterlist.c? */
@@ -385,7 +385,7 @@ struct tegra_bo *tegra_bo_create_with_handle(struct drm_file *file,
                return ERR_PTR(err);
        }
 
-       drm_gem_object_put_unlocked(&bo->gem);
+       drm_gem_object_put(&bo->gem);
 
        return bo;
 }