forked from Minki/linux
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>
This commit is contained in:
parent
c8c470afe3
commit
ff512357fe
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user