aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-02-27 20:03:39 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 22:10:13 -0500
commit4d53233a36fdda567cd4d080e27e1ee4b669ddd1 (patch)
treeea2db52bd4aea72c20eb7630e4f350c54772e0d6
parent748689d40c2554b91197349a98ef084dc0fa70c8 (diff)
drm: don't use idr_remove_all()
idr_destroy() can destroy idr by itself and idr_remove_all() is being deprecated. Drop its usage. * drm_ctxbitmap_cleanup() was calling idr_remove_all() but forgetting idr_destroy() thus leaking all buffered free idr_layers. Replace it with idr_destroy(). Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: David Airlie <airlied@linux.ie> Cc: Inki Dae <inki.dae@samsung.com> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/gpu/drm/drm_context.c2
-rw-r--r--drivers/gpu/drm/drm_crtc.c1
-rw-r--r--drivers/gpu/drm/drm_drv.c1
-rw-r--r--drivers/gpu/drm/drm_gem.c2
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_ipp.c4
-rw-r--r--drivers/gpu/drm/sis/sis_drv.c1
-rw-r--r--drivers/gpu/drm/via/via_map.c1
7 files changed, 1 insertions, 11 deletions
diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
index 45adf97e678f..75f62c5e2a6b 100644
--- a/drivers/gpu/drm/drm_context.c
+++ b/drivers/gpu/drm/drm_context.c
@@ -118,7 +118,7 @@ int drm_ctxbitmap_init(struct drm_device * dev)
118void drm_ctxbitmap_cleanup(struct drm_device * dev) 118void drm_ctxbitmap_cleanup(struct drm_device * dev)
119{ 119{
120 mutex_lock(&dev->struct_mutex); 120 mutex_lock(&dev->struct_mutex);
121 idr_remove_all(&dev->ctx_idr); 121 idr_destroy(&dev->ctx_idr);
122 mutex_unlock(&dev->struct_mutex); 122 mutex_unlock(&dev->struct_mutex);
123} 123}
124 124
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 3bdf2a650d9c..99928b933b16 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1272,7 +1272,6 @@ void drm_mode_config_cleanup(struct drm_device *dev)
1272 crtc->funcs->destroy(crtc); 1272 crtc->funcs->destroy(crtc);
1273 } 1273 }
1274 1274
1275 idr_remove_all(&dev->mode_config.crtc_idr);
1276 idr_destroy(&dev->mode_config.crtc_idr); 1275 idr_destroy(&dev->mode_config.crtc_idr);
1277} 1276}
1278EXPORT_SYMBOL(drm_mode_config_cleanup); 1277EXPORT_SYMBOL(drm_mode_config_cleanup);
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index be174cab105a..25f91cd23e60 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -297,7 +297,6 @@ static void __exit drm_core_exit(void)
297 297
298 unregister_chrdev(DRM_MAJOR, "drm"); 298 unregister_chrdev(DRM_MAJOR, "drm");
299 299
300 idr_remove_all(&drm_minors_idr);
301 idr_destroy(&drm_minors_idr); 300 idr_destroy(&drm_minors_idr);
302} 301}
303 302
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 24efae464e2c..e775859f0a83 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -561,8 +561,6 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
561{ 561{
562 idr_for_each(&file_private->object_idr, 562 idr_for_each(&file_private->object_idr,
563 &drm_gem_object_release_handle, file_private); 563 &drm_gem_object_release_handle, file_private);
564
565 idr_remove_all(&file_private->object_idr);
566 idr_destroy(&file_private->object_idr); 564 idr_destroy(&file_private->object_idr);
567} 565}
568 566
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 1a556354e92f..90398dfbfd75 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -1786,8 +1786,6 @@ err_iommu:
1786 drm_iommu_detach_device(drm_dev, ippdrv->dev); 1786 drm_iommu_detach_device(drm_dev, ippdrv->dev);
1787 1787
1788err_idr: 1788err_idr:
1789 idr_remove_all(&ctx->ipp_idr);
1790 idr_remove_all(&ctx->prop_idr);
1791 idr_destroy(&ctx->ipp_idr); 1789 idr_destroy(&ctx->ipp_idr);
1792 idr_destroy(&ctx->prop_idr); 1790 idr_destroy(&ctx->prop_idr);
1793 return ret; 1791 return ret;
@@ -1965,8 +1963,6 @@ static int ipp_remove(struct platform_device *pdev)
1965 exynos_drm_subdrv_unregister(&ctx->subdrv); 1963 exynos_drm_subdrv_unregister(&ctx->subdrv);
1966 1964
1967 /* remove,destroy ipp idr */ 1965 /* remove,destroy ipp idr */
1968 idr_remove_all(&ctx->ipp_idr);
1969 idr_remove_all(&ctx->prop_idr);
1970 idr_destroy(&ctx->ipp_idr); 1966 idr_destroy(&ctx->ipp_idr);
1971 idr_destroy(&ctx->prop_idr); 1967 idr_destroy(&ctx->prop_idr);
1972 1968
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 841065b998a1..5a5325e6b759 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -58,7 +58,6 @@ static int sis_driver_unload(struct drm_device *dev)
58{ 58{
59 drm_sis_private_t *dev_priv = dev->dev_private; 59 drm_sis_private_t *dev_priv = dev->dev_private;
60 60
61 idr_remove_all(&dev_priv->object_idr);
62 idr_destroy(&dev_priv->object_idr); 61 idr_destroy(&dev_priv->object_idr);
63 62
64 kfree(dev_priv); 63 kfree(dev_priv);
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index c0f1cc7f5ca9..d0ab3fb32acd 100644
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
@@ -120,7 +120,6 @@ int via_driver_unload(struct drm_device *dev)
120{ 120{
121 drm_via_private_t *dev_priv = dev->dev_private; 121 drm_via_private_t *dev_priv = dev->dev_private;
122 122
123 idr_remove_all(&dev_priv->object_idr);
124 idr_destroy(&dev_priv->object_idr); 123 idr_destroy(&dev_priv->object_idr);
125 124
126 kfree(dev_priv); 125 kfree(dev_priv);