drm/i915: convert to idr_alloc()

Convert to the much saner new idr interface.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
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>

1 files changed, 5 insertions, 16 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 21177d9df423..94d873a6cffb 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -139,7 +139,7 @@ create_hw_context(struct drm_device *dev,
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct i915_hw_context *ctx;
-        int ret, id;
+        int ret;
 
         ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
         if (ctx == NULL)
@@ -164,22 +164,11 @@ create_hw_context(struct drm_device *dev,
 
         ctx->file_priv = file_priv;
 
-again:
-        if (idr_pre_get(&file_priv->context_idr, GFP_KERNEL) == 0) {
-                ret = -ENOMEM;
-                DRM_DEBUG_DRIVER("idr allocation failed\n");
-                goto err_out;
-        }
-
-        ret = idr_get_new_above(&file_priv->context_idr, ctx,
-                                DEFAULT_CONTEXT_ID + 1, &id);
-        if (ret == 0)
-                ctx->id = id;
-
-        if (ret == -EAGAIN)
-                goto again;
-        else if (ret)
+        ret = idr_alloc(&file_priv->context_idr, ctx, DEFAULT_CONTEXT_ID + 1, 0,
+                        GFP_KERNEL);
+        if (ret < 0)
                 goto err_out;
+        ctx->id = ret;
 
         return ctx;