drm/msm: 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 Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
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-25-emil.l.velikov@gmail.com

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index 724024a2243a4bbbb19601ed25e624d47f2e567b..ad41ff023a1a7a8fc7966bfdb64c2de0f34fa74c 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -804,17 +804,17 @@ static void a5xx_destroy(struct msm_gpu *gpu)
 
        if (a5xx_gpu->pm4_bo) {
                msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->aspace);
-               drm_gem_object_put_unlocked(a5xx_gpu->pm4_bo);
+               drm_gem_object_put(a5xx_gpu->pm4_bo);
        }
 
        if (a5xx_gpu->pfp_bo) {
                msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->aspace);
-               drm_gem_object_put_unlocked(a5xx_gpu->pfp_bo);
+               drm_gem_object_put(a5xx_gpu->pfp_bo);
        }
 
        if (a5xx_gpu->gpmu_bo) {
                msm_gem_unpin_iova(a5xx_gpu->gpmu_bo, gpu->aspace);
-               drm_gem_object_put_unlocked(a5xx_gpu->gpmu_bo);
+               drm_gem_object_put(a5xx_gpu->gpmu_bo);
        }
 
        adreno_gpu_cleanup(adreno_gpu);

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 68af24150de57c626f31231a06ab364b844da1b9..34b85aaec7470dc46aad0eff2b81a7cc0fbcf34a 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -795,7 +795,7 @@ static void a6xx_destroy(struct msm_gpu *gpu)
 
        if (a6xx_gpu->sqe_bo) {
                msm_gem_unpin_iova(a6xx_gpu->sqe_bo, gpu->aspace);
-               drm_gem_object_put_unlocked(a6xx_gpu->sqe_bo);
+               drm_gem_object_put(a6xx_gpu->sqe_bo);
        }
 
        a6xx_gmu_remove(a6xx_gpu);

diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
index c9239b07fe4f9cda81e590c5935454c634c9f0d1..a0253297bc76953279defca6b4ac690659b8f6a0 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
@@ -119,7 +119,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)
        struct msm_kms *kms = &mdp4_kms->base.base;
 
        msm_gem_unpin_iova(val, kms->aspace);
-       drm_gem_object_put_unlocked(val);
+       drm_gem_object_put(val);
 }
 
 static void mdp4_crtc_destroy(struct drm_crtc *crtc)
@@ -452,7 +452,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc,
        return 0;
 
 fail:
-       drm_gem_object_put_unlocked(cursor_bo);
+       drm_gem_object_put(cursor_bo);
        return ret;
 }
 

diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
index dda05436f7166a91ba9bbc7271b16a811c4a59f1..243584d4b1d7c4304fd4abfa8d5ee48a434c1570 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
@@ -165,7 +165,7 @@ static void mdp4_destroy(struct msm_kms *kms)
 
        if (mdp4_kms->blank_cursor_iova)
                msm_gem_unpin_iova(mdp4_kms->blank_cursor_bo, kms->aspace);
-       drm_gem_object_put_unlocked(mdp4_kms->blank_cursor_bo);
+       drm_gem_object_put(mdp4_kms->blank_cursor_bo);
 
        if (aspace) {
                aspace->mmu->funcs->detach(aspace->mmu);

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
index 998bef1190a3cd0db2477cc0fb3647975c139cb4..ca3368c828d0807fafcfa1a21fd4cd3806a56435 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
@@ -166,7 +166,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)
        struct msm_kms *kms = &mdp5_kms->base.base;
 
        msm_gem_unpin_iova(val, kms->aspace);
-       drm_gem_object_put_unlocked(val);
+       drm_gem_object_put(val);
 }
 
 static void mdp5_crtc_destroy(struct drm_crtc *crtc)

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index 11ae5b8444c329f17b3193a22631e0df875fe707..66ca0c009cfa3668285a57bc73b6ff68ce91fddf 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -1132,7 +1132,7 @@ static void dsi_tx_buf_free(struct msm_dsi_host *msm_host)
        priv = dev->dev_private;
        if (msm_host->tx_gem_obj) {
                msm_gem_unpin_iova(msm_host->tx_gem_obj, priv->kms->aspace);
-               drm_gem_object_put_unlocked(msm_host->tx_gem_obj);
+               drm_gem_object_put(msm_host->tx_gem_obj);
                msm_host->tx_gem_obj = NULL;
        }
 

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 6baed5b43ea3317afde64d67fe63c60639911c2a..bc28df4eedeb96be03dafed97dcbb823060757c5 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -757,7 +757,7 @@ static int msm_ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
 
        ret = msm_gem_cpu_prep(obj, args->op, &timeout);
 
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
 
        return ret;
 }
@@ -775,7 +775,7 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
 
        ret = msm_gem_cpu_fini(obj);
 
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
 
        return ret;
 }
@@ -867,7 +867,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data,
                break;
        }
 
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index 37674e886e99012f0d7d70c5c4023c80dac8ec5d..d42f0665359ad8d6cd758786044d82d94f7713b9 100644 (file)
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -123,7 +123,7 @@ struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev,
 
 out_unref:
        for (i = 0; i < n; i++)
-               drm_gem_object_put_unlocked(bos[i]);
+               drm_gem_object_put(bos[i]);
        return ERR_PTR(ret);
 }
 
@@ -238,7 +238,7 @@ msm_alloc_stolen_fb(struct drm_device *dev, int w, int h, int p, uint32_t format
                /* note: if fb creation failed, we can't rely on fb destroy
                 * to unref the bo:
                 */
-               drm_gem_object_put_unlocked(bo);
+               drm_gem_object_put(bo);
                return ERR_CAST(fb);
        }
 

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 8696c405f709e22a29dd9f26075628e091ea3d5a..46e78993b69c4b07a53cb8a889469660e14cf53b 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -543,7 +543,7 @@ int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
 
        *offset = msm_gem_mmap_offset(obj);
 
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
 
 fail:
        return ret;
@@ -970,7 +970,7 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,
        ret = drm_gem_handle_create(file, obj, handle);
 
        /* drop reference from allocate - handle holds it now */
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
 
        return ret;
 }
@@ -1089,7 +1089,7 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev,
        return obj;
 
 fail:
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
        return ERR_PTR(ret);
 }
 
@@ -1149,7 +1149,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev,
        return obj;
 
 fail:
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
        return ERR_PTR(ret);
 }
 
@@ -1185,7 +1185,7 @@ err:
        if (locked)
                drm_gem_object_put_locked(obj);
        else
-               drm_gem_object_put_unlocked(obj);
+               drm_gem_object_put(obj);
 
        return ERR_PTR(ret);
 
@@ -1217,7 +1217,7 @@ void msm_gem_kernel_put(struct drm_gem_object *bo,
        if (locked)
                drm_gem_object_put_locked(bo);
        else
-               drm_gem_object_put_unlocked(bo);
+               drm_gem_object_put(bo);
 }
 
 void msm_gem_object_set_name(struct drm_gem_object *bo, const char *fmt, ...)