drm: Unify and fix idr error handling

The error handling code w.r.t. idr usage looks inconsistent.

In the case of drm_mode_object_get() and drm_ctxbitmap_next() the error
handling is also incomplete.

Unify the code to follow the same pattern always.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

4 files changed, 12 insertions, 12 deletions

diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
index 325365f6d355..affa629589ac 100644
--- a/drivers/gpu/drm/drm_context.c
+++ b/drivers/gpu/drm/drm_context.c
@@ -85,11 +85,12 @@ again:
         mutex_lock(&dev->struct_mutex);
         ret = idr_get_new_above(&dev->ctx_idr, NULL,
                                 DRM_RESERVED_CONTEXTS, &new_id);
-        if (ret == -EAGAIN) {
-                mutex_unlock(&dev->struct_mutex);
-                goto again;
-        }
         mutex_unlock(&dev->struct_mutex);
+        if (ret == -EAGAIN)
+                goto again;
+        else if (ret)
+                return ret;
+
         return new_id;
 }
 
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 4d4e8b055731..a9ca1b80fc28 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -227,7 +227,7 @@ static int drm_mode_object_get(struct drm_device *dev,
 again:
         if (idr_pre_get(&dev->mode_config.crtc_idr, GFP_KERNEL) == 0) {
                 DRM_ERROR("Ran out memory getting a mode number\n");
-                return -EINVAL;
+                return -ENOMEM;
         }
 
         mutex_lock(&dev->mode_config.idr_mutex);
@@ -235,6 +235,8 @@ again:
         mutex_unlock(&dev->mode_config.idr_mutex);
         if (ret == -EAGAIN)
                 goto again;
+        else if (ret)
+                return ret;
 
         obj->id = new_id;
         obj->type = obj_type;
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 83114b5e3cee..fc6ded8f318b 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -272,8 +272,7 @@ again:
         spin_unlock(&file_priv->table_lock);
         if (ret == -EAGAIN)
                 goto again;
-
-        if (ret != 0)
+        else if (ret)
                 return ret;
 
         drm_gem_object_handle_reference(obj);
@@ -456,8 +455,7 @@ again:
 
                 if (ret == -EAGAIN)
                         goto again;
-
-                if (ret != 0)
+                else if (ret)
                         goto err;
 
                 /* Allocate a reference for the name table.  */
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index aa454f80e109..ae1ccf1d5d96 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -122,11 +122,10 @@ again:
         ret = idr_get_new_above(&drm_minors_idr, NULL,
                                 base, &new_id);
         mutex_unlock(&dev->struct_mutex);
-        if (ret == -EAGAIN) {
+        if (ret == -EAGAIN)
                 goto again;
-        } else if (ret) {
+        else if (ret)
                 return ret;
-        }
 
         if (new_id >= limit) {
                 idr_remove(&drm_minors_idr, new_id);