drm/nouveau: 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: Ben Skeggs <bskeggs@redhat.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-26-emil.l.velikov@gmail.com

diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 1f08de4241e01b246d86d85ab4658dd56d368f03..27f511b9987b16f6124f1db5bd2fe2266c8da2e7 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -1017,7 +1017,7 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
        nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);
        nv_crtc->cursor.show(nv_crtc, true);
 out:
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
        return ret;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index e2bae1424502609eae715154150f28914835b127..72c91991b96a9f9cec215b7c8f91b807224f16ef 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -139,7 +139,7 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16,
        if (chan->ntfy) {
                nouveau_vma_del(&chan->ntfy_vma);
                nouveau_bo_unpin(chan->ntfy);
-               drm_gem_object_put_unlocked(&chan->ntfy->bo.base);
+               drm_gem_object_put(&chan->ntfy->bo.base);
        }
 
        if (chan->heap.block_size)

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 700817dc4fa04a74bb1ad8d8e0fc848037c0693f..60bef0ad028d6a1ccb86bdb9ae8d932be89110af 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -185,7 +185,7 @@ nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb)
        struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);
 
        if (fb->nvbo)
-               drm_gem_object_put_unlocked(&fb->nvbo->bo.base);
+               drm_gem_object_put(&fb->nvbo->bo.base);
 
        drm_framebuffer_cleanup(drm_fb);
        kfree(fb);
@@ -267,7 +267,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev,
        if (ret == 0)
                return &fb->base;
 
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
        return ERR_PTR(ret);
 }
 
@@ -648,7 +648,7 @@ nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
                return ret;
 
        ret = drm_gem_handle_create(file_priv, &bo->bo.base, &args->handle);
-       drm_gem_object_put_unlocked(&bo->bo.base);
+       drm_gem_object_put(&bo->bo.base);
        return ret;
 }
 
@@ -663,7 +663,7 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv,
        if (gem) {
                struct nouveau_bo *bo = nouveau_gem_object(gem);
                *poffset = drm_vma_node_offset_addr(&bo->bo.base.vma_node);
-               drm_gem_object_put_unlocked(gem);
+               drm_gem_object_put(gem);
                return 0;
        }
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index f5ece1f9497348a892ca8a7ddc97354df409d60b..5631c484d10f1b7d9f9c34a829225d3109744fc7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -279,7 +279,7 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,
        }
 
        /* drop reference from allocate - handle holds it now */
-       drm_gem_object_put_unlocked(&nvbo->bo.base);
+       drm_gem_object_put(&nvbo->bo.base);
        return ret;
 }
 
@@ -358,7 +358,7 @@ validate_fini_no_ticket(struct validate_op *op, struct nouveau_channel *chan,
                list_del(&nvbo->entry);
                nvbo->reserved_by = NULL;
                ttm_bo_unreserve(&nvbo->bo);
-               drm_gem_object_put_unlocked(&nvbo->bo.base);
+               drm_gem_object_put(&nvbo->bo.base);
        }
 }
 
@@ -405,14 +405,14 @@ retry:
                nvbo = nouveau_gem_object(gem);
                if (nvbo == res_bo) {
                        res_bo = NULL;
-                       drm_gem_object_put_unlocked(gem);
+                       drm_gem_object_put(gem);
                        continue;
                }
 
                if (nvbo->reserved_by && nvbo->reserved_by == file_priv) {
                        NV_PRINTK(err, cli, "multiple instances of buffer %d on "
                                      "validation list\n", b->handle);
-                       drm_gem_object_put_unlocked(gem);
+                       drm_gem_object_put(gem);
                        ret = -EINVAL;
                        break;
                }
@@ -929,7 +929,7 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
                ret = lret;
 
        nouveau_bo_sync_for_cpu(nvbo);
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
 
        return ret;
 }
@@ -948,7 +948,7 @@ nouveau_gem_ioctl_cpu_fini(struct drm_device *dev, void *data,
        nvbo = nouveau_gem_object(gem);
 
        nouveau_bo_sync_for_device(nvbo);
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
        return 0;
 }
 
@@ -965,7 +965,7 @@ nouveau_gem_ioctl_info(struct drm_device *dev, void *data,
                return -ENOENT;
 
        ret = nouveau_gem_info(file_priv, gem, req);
-       drm_gem_object_put_unlocked(gem);
+       drm_gem_object_put(gem);
        return ret;
 }