From: Tejun Heo <tj@kernel.org>
To: akpm@linux-foundation.org
Cc: axboe@kernel.dk, Kukjin Kim <kgene.kim@samsung.com>,
skinsbursky@parallels.com, rusty@rustcorp.com.au,
jmorris@namei.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, bfields@fieldses.org,
ebiederm@xmission.com, Tejun Heo <tj@kernel.org>
Subject: [PATCH 16/62] drm/exynos: convert to idr_alloc()
Date: Sat, 2 Feb 2013 17:20:17 -0800 [thread overview]
Message-ID: <1359854463-2538-17-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1359854463-2538-1-git-send-email-tj@kernel.org>
Convert to the much saner new idr interface.
Only compile tested.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: dri-devel@lists.freedesktop.org
---
This patch depends on an earlier idr changes and I think it would be
best to route these together through -mm. Please holler if there's
any objection. Thanks.
drivers/gpu/drm/exynos/exynos_drm_ipp.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 49278f0..62c24fb 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -137,21 +137,15 @@ static int ipp_create_id(struct idr *id_idr, struct mutex *lock, void *obj,
DRM_DEBUG_KMS("%s\n", __func__);
-again:
- /* ensure there is space available to allocate a handle */
- if (idr_pre_get(id_idr, GFP_KERNEL) == 0) {
- DRM_ERROR("failed to get idr.\n");
- return -ENOMEM;
- }
-
/* do the allocation under our mutexlock */
mutex_lock(lock);
- ret = idr_get_new_above(id_idr, obj, 1, (int *)idp);
+ ret = idr_alloc(id_idr, obj, 1, 0, GFP_KERNEL);
mutex_unlock(lock);
- if (ret == -EAGAIN)
- goto again;
+ if (ret < 0)
+ return ret;
- return ret;
+ *idp = ret;
+ return 0;
}
static void *ipp_find_obj(struct idr *id_idr, struct mutex *lock, u32 id)
--
1.8.1
next prev parent reply other threads:[~2013-02-03 1:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1359854463-2538-1-git-send-email-tj@kernel.org>
2013-02-03 1:20 ` [PATCH 15/62] drm: convert to idr_alloc() Tejun Heo
2013-02-03 1:20 ` Tejun Heo [this message]
2013-02-03 1:20 ` [PATCH 17/62] drm/i915: " Tejun Heo
2013-02-04 14:53 ` Daniel Vetter
2013-02-03 1:20 ` [PATCH 18/62] drm/sis: " Tejun Heo
2013-02-03 1:20 ` [PATCH 19/62] drm/via: " Tejun Heo
2013-02-03 1:20 ` [PATCH 20/62] drm/vmwgfx: " Tejun Heo
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=1359854463-2538-17-git-send-email-tj@kernel.org \
--to=tj@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=bfields@fieldses.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=ebiederm@xmission.com \
--cc=jmorris@namei.org \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=skinsbursky@parallels.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox