drm/vmwgfx: 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
36888db247
commit
cc39a8faed
1 changed files with 8 additions and 9 deletions
|
@ -177,17 +177,16 @@ int vmw_resource_alloc_id(struct vmw_resource *res)
|
|||
|
||||
BUG_ON(res->id != -1);
|
||||
|
||||
do {
|
||||
if (unlikely(idr_pre_get(idr, GFP_KERNEL) == 0))
|
||||
return -ENOMEM;
|
||||
idr_preload(GFP_KERNEL);
|
||||
write_lock(&dev_priv->resource_lock);
|
||||
|
||||
write_lock(&dev_priv->resource_lock);
|
||||
ret = idr_get_new_above(idr, res, 1, &res->id);
|
||||
write_unlock(&dev_priv->resource_lock);
|
||||
ret = idr_alloc(idr, res, 1, 0, GFP_NOWAIT);
|
||||
if (ret >= 0)
|
||||
res->id = ret;
|
||||
|
||||
} while (ret == -EAGAIN);
|
||||
|
||||
return ret;
|
||||
write_unlock(&dev_priv->resource_lock);
|
||||
idr_preload_end();
|
||||
return ret < 0 ? ret : 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue