drm/gma500: 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: Patrik Jakobsson <patrik.r.jakobsson@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-20-emil.l.velikov@gmail.com

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 23a78d7553827862d512368cc372c2b88a24b238..da02d7e8a8f5568ed532c1e12c6372119487be7f 100644 (file)
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -491,7 +491,7 @@ static int psb_fbdev_destroy(struct drm_device *dev,
        drm_framebuffer_cleanup(fb);
 
        if (fb->obj[0])
-               drm_gem_object_put_unlocked(fb->obj[0]);
+               drm_gem_object_put(fb->obj[0]);
        kfree(fb);
 
        return 0;

diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index 83ee86f70b89743f1a5f2022da23380be424d3c3..f9c4b1d76f566050bccb44dc6bcf80865dc7d1fd 100644 (file)
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -82,7 +82,7 @@ int psb_gem_create(struct drm_file *file, struct drm_device *dev, u64 size,
                return ret;
        }
        /* We have the initial and handle reference but need only one now */
-       drm_gem_object_put_unlocked(&r->gem);
+       drm_gem_object_put(&r->gem);
        *handlep = handle;
        return 0;
 }

diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
index 17f136985d21456b1ec4228e8946cfd5228f4fa4..3df6d6e850f5200ed189fc735a4b122db2e5ecf8 100644 (file)
--- a/drivers/gpu/drm/gma500/gma_display.c
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -351,7 +351,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
                        gt = container_of(gma_crtc->cursor_obj,
                                          struct gtt_range, gem);
                        psb_gtt_unpin(gt);
-                       drm_gem_object_put_unlocked(gma_crtc->cursor_obj);
+                       drm_gem_object_put(gma_crtc->cursor_obj);
                        gma_crtc->cursor_obj = NULL;
                }
                return 0;
@@ -427,7 +427,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
        if (gma_crtc->cursor_obj) {
                gt = container_of(gma_crtc->cursor_obj, struct gtt_range, gem);
                psb_gtt_unpin(gt);
-               drm_gem_object_put_unlocked(gma_crtc->cursor_obj);
+               drm_gem_object_put(gma_crtc->cursor_obj);
        }
 
        gma_crtc->cursor_obj = obj;
@@ -435,7 +435,7 @@ unlock:
        return ret;
 
 unref_cursor:
-       drm_gem_object_put_unlocked(obj);
+       drm_gem_object_put(obj);
        return ret;
 }