drm/panfrost: 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: Rob Herring <robh@kernel.org>
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Steven Price <steven.price@arm.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Steven Price <steven.price@arm.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-28-emil.l.velikov@gmail.com

diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 882fecc33fdb1db9fbbd1b4c7089fd7b0692d559..ada51df9a7a3265fae1c8ecf279dbb37fc3721f5 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -99,7 +99,7 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,
 
        mapping = panfrost_gem_mapping_get(bo, priv);
        if (!mapping) {
-               drm_gem_object_put_unlocked(&bo->base.base);
+               drm_gem_object_put(&bo->base.base);
                return -EINVAL;
        }
 
@@ -317,7 +317,7 @@ panfrost_ioctl_wait_bo(struct drm_device *dev, void *data,
        if (!ret)
                ret = timeout ? -ETIMEDOUT : -EBUSY;
 
-       drm_gem_object_put_unlocked(gem_obj);
+       drm_gem_object_put(gem_obj);
 
        return ret;
 }
@@ -351,7 +351,7 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data,
                args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);
 
 out:
-       drm_gem_object_put_unlocked(gem_obj);
+       drm_gem_object_put(gem_obj);
        return ret;
 }
 
@@ -372,7 +372,7 @@ static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data,
        bo = to_panfrost_bo(gem_obj);
 
        mapping = panfrost_gem_mapping_get(bo, priv);
-       drm_gem_object_put_unlocked(gem_obj);
+       drm_gem_object_put(gem_obj);
 
        if (!mapping)
                return -EINVAL;
@@ -438,7 +438,7 @@ out_unlock_mappings:
        mutex_unlock(&bo->mappings.lock);
        mutex_unlock(&pfdev->shrinker_lock);
 
-       drm_gem_object_put_unlocked(gem_obj);
+       drm_gem_object_put(gem_obj);
        return ret;
 }
 

diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c
index 17b654e1eb942fcff8c52d8cddc9bb46ce3a4188..ac5d0aa802766b9b705d767de790210ce7793e51 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_gem.c
+++ b/drivers/gpu/drm/panfrost/panfrost_gem.c
@@ -93,7 +93,7 @@ static void panfrost_gem_mapping_release(struct kref *kref)
        mapping = container_of(kref, struct panfrost_gem_mapping, refcount);
 
        panfrost_gem_teardown_mapping(mapping);
-       drm_gem_object_put_unlocked(&mapping->obj->base.base);
+       drm_gem_object_put(&mapping->obj->base.base);
        kfree(mapping);
 }
 
@@ -261,7 +261,7 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,
         */
        ret = drm_gem_handle_create(file_priv, &shmem->base, handle);
        /* drop reference from allocate - handle holds it now. */
-       drm_gem_object_put_unlocked(&shmem->base);
+       drm_gem_object_put(&shmem->base);
        if (ret)
                return ERR_PTR(ret);
 

diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index 7914b15708412e7ef21a0ee3981baa0663438658..b2f09c038d35ba4fe4f861ac7d6602a039305f97 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -281,7 +281,7 @@ static void panfrost_job_cleanup(struct kref *ref)
 
        if (job->bos) {
                for (i = 0; i < job->bo_count; i++)
-                       drm_gem_object_put_unlocked(job->bos[i]);
+                       drm_gem_object_put(job->bos[i]);
 
                kvfree(job->bos);
        }

diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
index ed28aeba6d59abf180f632f6c1a10a56b1a5c10a..0a339c6fbfaad7c536f996de17bf126051e68a7a 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -538,7 +538,7 @@ err_map:
 err_pages:
        drm_gem_shmem_put_pages(&bo->base);
 err_bo:
-       drm_gem_object_put_unlocked(&bo->base.base);
+       drm_gem_object_put(&bo->base.base);
        return ret;
 }
 

diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
index 6913578d5aa7211de705877f42d8eb210be5289c..ec4695cf3caf315b56c02c37e334457719f262f8 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
+++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
@@ -156,7 +156,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
                gpu_write(pfdev, GPU_PRFCNT_TILER_EN, 0xffffffff);
 
        /* The BO ref is retained by the mapping. */
-       drm_gem_object_put_unlocked(&bo->base);
+       drm_gem_object_put(&bo->base);
 
        return 0;
 
@@ -167,7 +167,7 @@ err_put_mapping:
 err_close_bo:
        panfrost_gem_close(&bo->base, file_priv);
 err_put_bo:
-       drm_gem_object_put_unlocked(&bo->base);
+       drm_gem_object_put(&bo->base);
        return ret;
 }