[PATCH v2 32/38] drm/v3d: remove _unlocked suffix in drm_object_put_unlocked

[Emil Velikov]

From: Emil Velikov <emil.veli...@collabora.com>

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: Eric Anholt <e...@anholt.net>
Cc: David Airlie <airl...@linux.ie>
Cc: Daniel Vetter <dan...@ffwll.ch>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
---
 drivers/gpu/drm/v3d/v3d_bo.c  | 6 +++---
 drivers/gpu/drm/v3d/v3d_gem.c | 4 ++--
 drivers/gpu/drm/v3d/v3d_irq.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c
index edd299ab53d8..8b52cb25877c 100644
--- a/drivers/gpu/drm/v3d/v3d_bo.c
+++ b/drivers/gpu/drm/v3d/v3d_bo.c
@@ -185,7 +185,7 @@ int v3d_create_bo_ioctl(struct drm_device *dev, void *data,
        args->offset = bo->node.start << PAGE_SHIFT;
 
        ret = drm_gem_handle_create(file_priv, &bo->base.base, &args->handle);
-       drm_gem_object_put_unlocked(&bo->base.base);
+       drm_gem_object_put(&bo->base.base);
 
        return ret;
 }
@@ -208,7 +208,7 @@ int v3d_mmap_bo_ioctl(struct drm_device *dev, void *data,
        }
 
        args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);
-       drm_gem_object_put_unlocked(gem_obj);
+       drm_gem_object_put(gem_obj);
 
        return 0;
 }
@@ -229,6 +229,6 @@ int v3d_get_bo_offset_ioctl(struct drm_device *dev, void 
*data,
 
        args->offset = bo->node.start << PAGE_SHIFT;
 
-       drm_gem_object_put_unlocked(gem_obj);
+       drm_gem_object_put(gem_obj);
        return 0;
 }
diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
index 09a7639cf161..915f8bfdb58c 100644
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -358,7 +358,7 @@ v3d_job_free(struct kref *ref)
 
        for (i = 0; i < job->bo_count; i++) {
                if (job->bo[i])
-                       drm_gem_object_put_unlocked(job->bo[i]);
+                       drm_gem_object_put(job->bo[i]);
        }
        kvfree(job->bo);
 
@@ -384,7 +384,7 @@ v3d_render_job_free(struct kref *ref)
        struct v3d_bo *bo, *save;
 
        list_for_each_entry_safe(bo, save, &job->unref_list, unref_head) {
-               drm_gem_object_put_unlocked(&bo->base.base);
+               drm_gem_object_put(&bo->base.base);
        }
 
        v3d_job_free(ref);
diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c
index 51b65263c657..c88686489b88 100644
--- a/drivers/gpu/drm/v3d/v3d_irq.c
+++ b/drivers/gpu/drm/v3d/v3d_irq.c
@@ -72,7 +72,7 @@ v3d_overflow_mem_work(struct work_struct *work)
        V3D_CORE_WRITE(0, V3D_PTB_BPOS, obj->size);
 
 out:
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
 }
 
 static irqreturn_t
-- 
2.25.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel