Skip to content

Commit

Permalink
drm: don't use idr_remove_all()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tejun Heo authored and Linus Torvalds committed Feb 28, 2013
1 parent 748689d commit 4d53233
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_context.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ int drm_ctxbitmap_init(struct drm_device * dev)
void drm_ctxbitmap_cleanup(struct drm_device * dev)
{
mutex_lock(&dev->struct_mutex);
idr_remove_all(&dev->ctx_idr);
idr_destroy(&dev->ctx_idr);
mutex_unlock(&dev->struct_mutex);
}

Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/drm_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,6 @@ void drm_mode_config_cleanup(struct drm_device *dev)
crtc->funcs->destroy(crtc);
}

idr_remove_all(&dev->mode_config.crtc_idr);
idr_destroy(&dev->mode_config.crtc_idr);
}
EXPORT_SYMBOL(drm_mode_config_cleanup);
Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/drm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ static void __exit drm_core_exit(void)

unregister_chrdev(DRM_MAJOR, "drm");

idr_remove_all(&drm_minors_idr);
idr_destroy(&drm_minors_idr);
}

Expand Down
2 changes: 0 additions & 2 deletions drivers/gpu/drm/drm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,6 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
{
idr_for_each(&file_private->object_idr,
&drm_gem_object_release_handle, file_private);

idr_remove_all(&file_private->object_idr);
idr_destroy(&file_private->object_idr);
}

Expand Down
4 changes: 0 additions & 4 deletions drivers/gpu/drm/exynos/exynos_drm_ipp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1786,8 +1786,6 @@ static int ipp_subdrv_probe(struct drm_device *drm_dev, struct device *dev)
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;
Expand Down Expand Up @@ -1965,8 +1963,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);

Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/sis/sis_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ static int sis_driver_unload(struct drm_device *dev)
{
drm_sis_private_t *dev_priv = dev->dev_private;

idr_remove_all(&dev_priv->object_idr);
idr_destroy(&dev_priv->object_idr);

kfree(dev_priv);
Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/via/via_map.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ int via_driver_unload(struct drm_device *dev)
{
drm_via_private_t *dev_priv = dev->dev_private;

idr_remove_all(&dev_priv->object_idr);
idr_destroy(&dev_priv->object_idr);

kfree(dev_priv);
Expand Down

0 comments on commit 4d53233

Please sign in to comment.