1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 1a556354e92f..1adce07ecb5b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -137,21 +137,15 @@ static int ipp_create_id(struct idr *id_idr, struct mutex *lock, void *obj,
 
         DRM_DEBUG_KMS("%s\n", __func__);
 
-again:
-        /* ensure there is space available to allocate a handle */
-        if (idr_pre_get(id_idr, GFP_KERNEL) == 0) {
-                DRM_ERROR("failed to get idr.\n");
-                return -ENOMEM;
-        }
-
         /* do the allocation under our mutexlock */
         mutex_lock(lock);
-        ret = idr_get_new_above(id_idr, obj, 1, (int *)idp);
+        ret = idr_alloc(id_idr, obj, 1, 0, GFP_KERNEL);
         mutex_unlock(lock);
-        if (ret == -EAGAIN)
-                goto again;
+        if (ret < 0)
+                return ret;
 
-        return ret;
+        *idp = ret;
+        return 0;
 }
 
 static void *ipp_find_obj(struct idr *id_idr, struct mutex *lock, u32 id)
@@ -1786,8 +1780,6 @@ err_iommu:
                         drm_iommu_detach_device(drm_dev, ippdrv->dev);
 
 err_idr:
-        idr_remove_all(&ctx->ipp_idr);
-        idr_remove_all(&ctx->prop_idr);
         idr_destroy(&ctx->ipp_idr);
         idr_destroy(&ctx->prop_idr);
         return ret;
@@ -1965,8 +1957,6 @@ static int ipp_remove(struct platform_device *pdev)
         exynos_drm_subdrv_unregister(&ctx->subdrv);
 
         /* remove,destroy ipp idr */
-        idr_remove_all(&ctx->ipp_idr);
-        idr_remove_all(&ctx->prop_idr);
         idr_destroy(&ctx->ipp_idr);
         idr_destroy(&ctx->prop_idr);