drm/armada: 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: Russell King <linux@armlinux.org.uk>
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-17-emil.l.velikov@gmail.com

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index c2b92ac..38dfaa4 100644 (file)
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -710,13 +710,13 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
 
                /* Must be a kernel-mapped object */
                if (!obj->addr) {
-                       drm_gem_object_put_unlocked(&obj->obj);
+                       drm_gem_object_put(&obj->obj);
                        return -EINVAL;
                }
 
                if (obj->obj.size < w * h * 4) {
                        DRM_ERROR("buffer is too small\n");
-                       drm_gem_object_put_unlocked(&obj->obj);
+                       drm_gem_object_put(&obj->obj);
                        return -ENOMEM;
                }
        }
@@ -724,7 +724,7 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
        if (dcrtc->cursor_obj) {
                dcrtc->cursor_obj->update = NULL;
                dcrtc->cursor_obj->update_data = NULL;
-               drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);
+               drm_gem_object_put(&dcrtc->cursor_obj->obj);
        }
        dcrtc->cursor_obj = obj;
        dcrtc->cursor_w = w;
@@ -760,7 +760,7 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc)
        struct armada_private *priv = crtc->dev->dev_private;
 
        if (dcrtc->cursor_obj)
-               drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);
+               drm_gem_object_put(&dcrtc->cursor_obj->obj);
 
        priv->dcrtc[dcrtc->num] = NULL;
        drm_crtc_cleanup(&dcrtc->crtc);

diff --git a/drivers/gpu/drm/armada/armada_fb.c b/drivers/gpu/drm/armada/armada_fb.c
index 426ca38..b87c717 100644 (file)
--- a/drivers/gpu/drm/armada/armada_fb.c
+++ b/drivers/gpu/drm/armada/armada_fb.c
@@ -129,12 +129,12 @@ struct drm_framebuffer *armada_fb_create(struct drm_device *dev,
                goto err;
        }
 
-       drm_gem_object_put_unlocked(&obj->obj);
+       drm_gem_object_put(&obj->obj);
 
        return &dfb->fb;
 
  err_unref:
-       drm_gem_object_put_unlocked(&obj->obj);
+       drm_gem_object_put(&obj->obj);
  err:
        DRM_ERROR("failed to initialize framebuffer: %d\n", ret);
        return ERR_PTR(ret);

diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
index f2dc371..0c46012 100644 (file)
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -51,13 +51,13 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh,
 
        ret = armada_gem_linear_back(dev, obj);
        if (ret) {
-               drm_gem_object_put_unlocked(&obj->obj);
+               drm_gem_object_put(&obj->obj);
                return ret;
        }
 
        ptr = armada_gem_map_object(dev, obj);
        if (!ptr) {
-               drm_gem_object_put_unlocked(&obj->obj);
+               drm_gem_object_put(&obj->obj);
                return -ENOMEM;
        }
 
@@ -67,7 +67,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh,
         * A reference is now held by the framebuffer object if
         * successful, otherwise this drops the ref for the error path.
         */
-       drm_gem_object_put_unlocked(&obj->obj);
+       drm_gem_object_put(&obj->obj);
 
        if (IS_ERR(dfb))
                return PTR_ERR(dfb);

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 976685f..8005614 100644 (file)
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -256,7 +256,7 @@ int armada_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
        /* drop reference from allocate - handle holds it now */
        DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
  err:
-       drm_gem_object_put_unlocked(&dobj->obj);
+       drm_gem_object_put(&dobj->obj);
        return ret;
 }
 
@@ -288,7 +288,7 @@ int armada_gem_create_ioctl(struct drm_device *dev, void *data,
        /* drop reference from allocate - handle holds it now */
        DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
  err:
-       drm_gem_object_put_unlocked(&dobj->obj);
+       drm_gem_object_put(&dobj->obj);
        return ret;
 }
 
@@ -305,13 +305,13 @@ int armada_gem_mmap_ioctl(struct drm_device *dev, void *data,
                return -ENOENT;
 
        if (!dobj->obj.filp) {
-               drm_gem_object_put_unlocked(&dobj->obj);
+               drm_gem_object_put(&dobj->obj);
                return -EINVAL;
        }
 
        addr = vm_mmap(dobj->obj.filp, 0, args->size, PROT_READ | PROT_WRITE,
                       MAP_SHARED, args->offset);
-       drm_gem_object_put_unlocked(&dobj->obj);
+       drm_gem_object_put(&dobj->obj);
        if (IS_ERR_VALUE(addr))
                return addr;
 
@@ -366,7 +366,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data,
        }
 
  unref:
-       drm_gem_object_put_unlocked(&dobj->obj);
+       drm_gem_object_put(&dobj->obj);
        return ret;
 }