Skip to content

Commit eedba1b

Browse files
lumagrobclark
authored andcommitted
drm/msm: switch to drmm_mode_config_init()
Switch to drmm_mode_config_init() instead of drm_mode_config_init(). Drop drm_mode_config_cleanup() calls. Reviewed-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/561654/ Signed-off-by: Rob Clark <robdclark@chromium.org>
1 parent 937154e commit eedba1b

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

drivers/gpu/drm/msm/msm_drv.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,6 @@ static int msm_drm_uninit(struct device *dev)
238238
if (kms)
239239
msm_disp_snapshot_destroy(ddev);
240240

241-
drm_mode_config_cleanup(ddev);
242-
243241
if (kms) {
244242
pm_runtime_get_sync(dev);
245243
msm_irq_uninstall(ddev);
@@ -440,11 +438,13 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
440438
might_lock(&priv->lru.lock);
441439
fs_reclaim_release(GFP_KERNEL);
442440

443-
drm_mode_config_init(ddev);
441+
ret = drmm_mode_config_init(ddev);
442+
if (ret)
443+
goto err_destroy_wq;
444444

445445
ret = msm_init_vram(ddev);
446446
if (ret)
447-
goto err_cleanup_mode_config;
447+
goto err_destroy_wq;
448448

449449
dma_set_max_seg_size(dev, UINT_MAX);
450450

@@ -553,8 +553,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
553553

554554
err_deinit_vram:
555555
msm_deinit_vram(ddev);
556-
err_cleanup_mode_config:
557-
drm_mode_config_cleanup(ddev);
556+
err_destroy_wq:
558557
destroy_workqueue(priv->wq);
559558
err_put_dev:
560559
drm_dev_put(ddev);

0 commit comments

Comments
 (0)