dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Zimmermann <tdz@users.sourceforge.net>
To: dri-devel@lists.freedesktop.org
Cc: Thomas Zimmermann <tdz@users.sourceforge.net>
Subject: [PATCH 4/7] drm: Replace __drm_gem_object_unreference with __drm_gem_object_put
Date: Sat,  9 Jun 2018 15:18:02 +0200	[thread overview]
Message-ID: <20180609131805.2738-5-tdz@users.sourceforge.net> (raw)
In-Reply-To: <20180609131805.2738-1-tdz@users.sourceforge.net>

This patch unifies the naming of DRM functions for reference counting
of struct drm_gem_object. The resulting code is more aligned with the
rest of the Linux kernel interfaces.

The patch also deletes the old function and removes it from the
Coccinelle script.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
---
 drivers/gpu/drm/i915/i915_gem_object.h   |  2 +-
 include/drm/drm_gem.h                    | 13 -------------
 scripts/coccinelle/api/drm-get-put.cocci |  5 -----
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_object.h b/drivers/gpu/drm/i915/i915_gem_object.h
index da6e849f41a4..0042496216fe 100644
--- a/drivers/gpu/drm/i915/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/i915_gem_object.h
@@ -345,7 +345,7 @@ __attribute__((nonnull))
 static inline void
 i915_gem_object_put(struct drm_i915_gem_object *obj)
 {
-	__drm_gem_object_unreference(&obj->base);
+	__drm_gem_object_put(&obj->base);
 }
 
 __deprecated
diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
index 43465aa4eb73..2c3f04e071cf 100644
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@ -222,19 +222,6 @@ __drm_gem_object_put(struct drm_gem_object *obj)
 void drm_gem_object_put_unlocked(struct drm_gem_object *obj);
 void drm_gem_object_put(struct drm_gem_object *obj);
 
-/**
- * __drm_gem_object_unreference - raw function to release a GEM buffer object
- *                                reference
- * @obj: GEM buffer object
- *
- * This is a compatibility alias for __drm_gem_object_put() and should not be
- * used by new code.
- */
-static inline void __drm_gem_object_unreference(struct drm_gem_object *obj)
-{
-	__drm_gem_object_put(obj);
-}
-
 /**
  * drm_gem_object_unreference_unlocked - release a GEM buffer object reference
  * @obj: GEM buffer object
diff --git a/scripts/coccinelle/api/drm-get-put.cocci b/scripts/coccinelle/api/drm-get-put.cocci
index c37aa5beca77..4a948790b83c 100644
--- a/scripts/coccinelle/api/drm-get-put.cocci
+++ b/scripts/coccinelle/api/drm-get-put.cocci
@@ -16,9 +16,6 @@ expression object;
 @@
 
 (
-- __drm_gem_object_unreference(object)
-+ __drm_gem_object_put(object)
-|
 - drm_gem_object_unreference_unlocked(object)
 + drm_gem_object_put_unlocked(object)
 |
@@ -32,8 +29,6 @@ position p;
 @@
 
 (
-__drm_gem_object_unreference(object)
-|
 drm_gem_object_unreference_unlocked(object)
 |
 drm_dev_unref@p(object)
-- 
2.14.4

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

  parent reply	other threads:[~2018-06-09 13:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-09 13:17 [PATCH 0/7] Replace {un/reference} with {put,get} functions Thomas Zimmermann
2018-06-09 13:17 ` [PATCH 1/7] drm: Replace drm_connector_{un/reference} with drm_connector_{put, get} Thomas Zimmermann
2018-06-09 13:18 ` [PATCH 2/7] drm: Replace drm_framebuffer_{un/reference} with drm_framebuffer_{put, get} Thomas Zimmermann
2018-06-09 13:18 ` [PATCH 3/7] drm: Replace drm_gem_object_{un/reference} with drm_gem_object_{put, get} Thomas Zimmermann
2018-06-09 13:18 ` Thomas Zimmermann [this message]
2018-06-09 13:18 ` [PATCH 5/7] drm: Replace drm_gem_object_unreference_unlocked with put function Thomas Zimmermann
2018-06-09 13:18 ` [PATCH 6/7] drm: Replace drm_dev_unref with drm_dev_put Thomas Zimmermann
2018-06-18  8:18   ` Benjamin Gaignard
2018-06-18 14:39   ` Philippe CORNU
2018-06-19 15:25   ` Alex Deucher
2018-06-09 13:18 ` [PATCH 7/7] drm: Clean up after DRM put/get conversion Thomas Zimmermann
2018-06-18  8:47 ` [PATCH 0/7] Replace {un/reference} with {put,get} functions Daniel Vetter
2018-06-18 11:06   ` 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=20180609131805.2738-5-tdz@users.sourceforge.net \
    --to=tdz@users.sourceforge.net \
    --cc=dri-devel@lists.freedesktop.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox