drm/lima: 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: Qiang Yu <yuq825@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: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-22-emil.l.velikov@gmail.com

diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c
index 5404e0d668dbbb5e6ff152d565960280e0ee8cff..155f2b4b4030aad26d70bc4a5dedbff10e392592 100644 (file)
--- a/drivers/gpu/drm/lima/lima_gem.c
+++ b/drivers/gpu/drm/lima/lima_gem.c
@@ -134,7 +134,7 @@ int lima_gem_create_handle(struct drm_device *dev, struct drm_file *file,
 
 out:
        /* drop reference from allocate - handle holds it now */
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
 
        return err;
 }
@@ -243,7 +243,7 @@ int lima_gem_get_info(struct drm_file *file, u32 handle, u32 *va, u64 *offset)
 
        *offset = drm_vma_node_offset_addr(&obj->vma_node);
 
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
        return 0;
 }
 
@@ -323,7 +323,7 @@ int lima_gem_submit(struct drm_file *file, struct lima_submit *submit)
                 */
                err = lima_vm_bo_add(vm, bo, false);
                if (err) {
-                       drm_gem_object_put_unlocked(obj);
+                       drm_gem_object_put(obj);
                        goto err_out0;
                }
 
@@ -368,7 +368,7 @@ int lima_gem_submit(struct drm_file *file, struct lima_submit *submit)
                                    submit->nr_bos, &ctx);
 
        for (i = 0; i < submit->nr_bos; i++)
-               drm_gem_object_put_unlocked(&bos[i]->base.base);
+               drm_gem_object_put(&bos[i]->base.base);
 
        if (out_sync) {
                drm_syncobj_replace_fence(out_sync, fence);
@@ -389,7 +389,7 @@ err_out0:
                if (!bos[i])
                        break;
                lima_vm_bo_del(vm, bos[i]);
-               drm_gem_object_put_unlocked(&bos[i]->base.base);
+               drm_gem_object_put(&bos[i]->base.base);
        }
        if (out_sync)
                drm_syncobj_put(out_sync);

diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c
index e6cefda0027959d169d059ecb99d959945792a17..64ced6d0e6cf9c741038071857e2fa88b74810eb 100644 (file)
--- a/drivers/gpu/drm/lima/lima_sched.c
+++ b/drivers/gpu/drm/lima/lima_sched.c
@@ -151,7 +151,7 @@ void lima_sched_task_fini(struct lima_sched_task *task)
 
        if (task->bos) {
                for (i = 0; i < task->num_bos; i++)
-                       drm_gem_object_put_unlocked(&task->bos[i]->base.base);
+                       drm_gem_object_put(&task->bos[i]->base.base);
                kfree(task->bos);
        }