All of lore.kernel.org
 help / color / mirror / Atom feed
From: Emil Velikov <emil.l.velikov@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie>,
	Tomi Valkeinen <tomi.valkeinen@ti.com>,
	emil.l.velikov@gmail.com
Subject: [PATCH v2 26/38] drm/omapdrm: remove _unlocked suffix in drm_object_put_unlocked
Date: Fri, 15 May 2020 10:51:06 +0100	[thread overview]
Message-ID: <20200515095118.2743122-27-emil.l.velikov@gmail.com> (raw)
In-Reply-To: <20200515095118.2743122-1-emil.l.velikov@gmail.com>

From: Emil Velikov <emil.velikov@collabora.com>

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: Tomi Valkeinen <tomi.valkeinen@ti.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>
---
 drivers/gpu/drm/omapdrm/omap_drv.c   | 2 +-
 drivers/gpu/drm/omapdrm/omap_fb.c    | 2 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +-
 drivers/gpu/drm/omapdrm/omap_gem.c   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index cdafd7ef1c32..242d28281784 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -503,7 +503,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
 	args->size = omap_gem_mmap_size(obj);
 	args->offset = omap_gem_mmap_offset(obj);
 
-	drm_gem_object_put_unlocked(obj);
+	drm_gem_object_put(obj);
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 9aeab81dfb90..05f30e2618c9 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -326,7 +326,7 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
 
 error:
 	while (--i >= 0)
-		drm_gem_object_put_unlocked(bos[i]);
+		drm_gem_object_put(bos[i]);
 
 	return fb;
 }
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 09a84919ef73..3f6cfc24fb64 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -140,7 +140,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
 		/* note: if fb creation failed, we can't rely on fb destroy
 		 * to unref the bo:
 		 */
-		drm_gem_object_put_unlocked(fbdev->bo);
+		drm_gem_object_put(fbdev->bo);
 		ret = PTR_ERR(fb);
 		goto fail;
 	}
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index d08ae95ecc0a..d0d12d5dd76c 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -629,7 +629,7 @@ int omap_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
 
 	*offset = omap_gem_mmap_offset(obj);
 
-	drm_gem_object_put_unlocked(obj);
+	drm_gem_object_put(obj);
 
 fail:
 	return ret;
@@ -1348,7 +1348,7 @@ int omap_gem_new_handle(struct drm_device *dev, struct drm_file *file,
 	}
 
 	/* drop reference from allocate - handle holds it now */
-	drm_gem_object_put_unlocked(obj);
+	drm_gem_object_put(obj);
 
 	return 0;
 }
-- 
2.25.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2020-05-15  9:55 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-15  9:50 [PATCH v2 00/38] Fareless gem_free_object Emil Velikov
2020-05-15  9:50 ` [PATCH v2 01/38] drm: remove unused drm_gem.h include Emil Velikov
2020-05-15  9:50 ` [PATCH v2 02/38] drm/gem: use _unlocked reference in drm_gem_objects_lookup docs Emil Velikov
2020-05-15  9:50 ` [PATCH v2 03/38] drm/todo: mention i915 in the struct_mutex section Emil Velikov
2020-05-15  9:50 ` [PATCH v2 04/38] drm/doc: drop struct_mutex references Emil Velikov
2020-05-15  9:50 ` [PATCH v2 05/38] drm/doc: add WARNING for drm_device::struct_mutex Emil Velikov
2020-05-15  9:50 ` [PATCH v2 06/38] drm/doc: drop struct_mutex reference for drm_gem_object_free Emil Velikov
2020-05-15  9:50 ` [PATCH v2 07/38] drm/amdgpu: use the unlocked drm_gem_object_put Emil Velikov
2020-05-15  9:50   ` Emil Velikov
2020-05-15  9:50 ` [PATCH v2 08/38] drm/gma500: Use lockless gem BO free callback Emil Velikov
2020-05-15  9:50 ` [PATCH v2 09/38] drm: remove drm_driver::gem_free_object Emil Velikov
2020-05-15 14:22   ` Daniel Vetter
2020-05-15  9:50 ` [PATCH v2 10/38] drm/gem: fold drm_gem_object_put_unlocked and __drm_gem_object_put() Emil Velikov
2020-05-15 14:24   ` Daniel Vetter
2020-05-15  9:50 ` [PATCH v2 11/38] drm/gem: add _locked suffix to drm_object_put Emil Velikov
2020-05-15  9:50   ` Emil Velikov
2020-05-15 12:24   ` Thomas Zimmermann
2020-05-15 12:24     ` Thomas Zimmermann
2020-05-15 12:46   ` Steven Price
2020-05-15 12:46     ` Steven Price
2020-05-15  9:50 ` [PATCH v2 12/38] drm/gem: add drm_object_put helper Emil Velikov
2020-05-15 15:14   ` Steven Price
2020-05-15  9:50 ` [PATCH v2 13/38] drm: remove _unlocked suffix in drm_object_put_unlocked Emil Velikov
2020-05-15 12:46   ` Steven Price
2020-05-15  9:50 ` [PATCH v2 14/38] drm/amd: " Emil Velikov
2020-05-15  9:50 ` [PATCH v2 15/38] drm/arm: " Emil Velikov
2020-05-15  9:50 ` [PATCH v2 16/38] drm/armada: " Emil Velikov
2020-05-15  9:50 ` [PATCH v2 17/38] drm/etnaviv: " Emil Velikov
2020-05-15  9:50 ` [PATCH v2 18/38] drm/exynos: " Emil Velikov
2020-05-15  9:50 ` [PATCH v2 19/38] drm/gma500: " Emil Velikov
2020-05-15  9:51 ` [PATCH v2 20/38] drm/i915: " Emil Velikov
2020-05-15  9:51 ` [PATCH v2 21/38] drm/lima: " Emil Velikov
2020-05-15  9:51 ` [PATCH v2 22/38] drm/mediatek: " Emil Velikov
2020-05-15  9:51 ` [PATCH v2 23/38] drm/mgag200: " Emil Velikov
2020-05-15  9:51 ` [PATCH v2 24/38] drm/msm: " Emil Velikov
2020-05-15  9:51 ` [PATCH v2 25/38] drm/nouveau: " Emil Velikov
2020-05-15  9:51 ` Emil Velikov [this message]
2020-05-15  9:51 ` [PATCH v2 27/38] drm/panfrost: " Emil Velikov
2020-05-15 12:46   ` Steven Price
2020-05-15  9:51 ` [PATCH v2 28/38] drm/qxl: " Emil Velikov
2020-05-15 10:14   ` Gerd Hoffmann
2020-05-15  9:51 ` [PATCH v2 29/38] drm/radeon: " Emil Velikov
2020-05-15  9:51 ` [PATCH v2 30/38] drm/rockchip: " Emil Velikov
2020-05-15 10:23   ` Heiko Stübner
2020-05-15  9:51 ` [PATCH v2 31/38] drm/tegra: " Emil Velikov
2020-05-15 11:52   ` Thierry Reding
2020-05-15  9:51 ` [PATCH v2 32/38] drm/v3d: " Emil Velikov
2020-05-15  9:51 ` [PATCH v2 33/38] drm/vc4: " Emil Velikov
2020-05-15  9:51 ` [PATCH v2 34/38] drm/vgem: " Emil Velikov
2020-05-15 14:26   ` Daniel Vetter
2020-05-15  9:51 ` [PATCH v2 35/38] drm/virtio: " Emil Velikov
2020-05-15 10:14   ` Gerd Hoffmann
2020-05-15  9:51 ` [PATCH v2 36/38] drm/vkms: " Emil Velikov
2020-05-15 14:26   ` Daniel Vetter
2020-05-15  9:51 ` [PATCH v2 37/38] drm/xen: " Emil Velikov
2020-05-15 10:12   ` Oleksandr Andrushchenko
2020-05-15  9:51 ` [PATCH v2 38/38] drm: remove transient drm_object_put_unlocked() Emil Velikov
2020-05-15 12:27 ` [PATCH v2 00/38] Fareless gem_free_object Thomas Zimmermann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200515095118.2743122-27-emil.l.velikov@gmail.com \
    --to=emil.l.velikov@gmail.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=tomi.valkeinen@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.