leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/sis: convert to idr_alloc()

Browse Source 
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>
This commit is contained in:
Tejun Heo 2013-02-27 17:04:11 -08:00 committed by Linus Torvalds
parent c8c470afe3
commit ff512357fe
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/sis/sis_mm.c
View File

@ -128,17 +128,10 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
if (retval) if (retval)
goto fail_alloc; goto fail_alloc;
again: retval = idr_alloc(&dev_priv->object_idr, item, 1, 0, GFP_KERNEL);
if (idr_pre_get(&dev_priv->object_idr, GFP_KERNEL) == 0) { if (retval < 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)
goto fail_idr; goto fail_idr;
user_key = retval;
list_add(&item->owner_list, &file_priv->obj_list); list_add(&item->owner_list, &file_priv->obj_list);
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);