diff options
| author | Tejun Heo <tj@kernel.org> | 2013-02-27 17:04:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 19:10:16 -0800 |
| commit | ff512357fe1bf7f901bd0ea19fc718025dff6b07 (patch) | |
| tree | d232c34f6bfe534e7bdb893b3015c2835f362c7f | |
| parent | c8c470afe316002d5d5259a134984ed03f40e249 (diff) | |
| download | kernel_goldelico_gta04-ff512357fe1bf7f901bd0ea19fc718025dff6b07.zip kernel_goldelico_gta04-ff512357fe1bf7f901bd0ea19fc718025dff6b07.tar.gz kernel_goldelico_gta04-ff512357fe1bf7f901bd0ea19fc718025dff6b07.tar.bz2 | |
drm/sis: convert to idr_alloc()
Convert to the much saner new idr interface.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: David Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/gpu/drm/sis/sis_mm.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c index 2b2f78c..9a43d98 100644 --- a/drivers/gpu/drm/sis/sis_mm.c +++ b/drivers/gpu/drm/sis/sis_mm.c @@ -128,17 +128,10 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file, if (retval) goto fail_alloc; -again: - if (idr_pre_get(&dev_priv->object_idr, GFP_KERNEL) == 0) { - retval = -ENOMEM; - goto fail_idr; - } - - retval = idr_get_new_above(&dev_priv->object_idr, item, 1, &user_key); - if (retval == -EAGAIN) - goto again; - if (retval) + retval = idr_alloc(&dev_priv->object_idr, item, 1, 0, GFP_KERNEL); + if (retval < 0) goto fail_idr; + user_key = retval; list_add(&item->owner_list, &file_priv->obj_list); mutex_unlock(&dev->struct_mutex); |