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>
This commit is contained in:
parent
748689d40c
commit
4d53233a36
7 changed files with 1 additions and 11 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue