From e46e5330d13de67de5b614c5021730e9709de975 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 29 Oct 2020 20:01:00 +0100 Subject: [PATCH] drm/vc4: drv: Use managed drm_mode_config_init Using drmm_mode_config_init instead of drm_mode_config_init allows us to cleanup a bit the error path. Signed-off-by: Maxime Ripard Acked-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20201029190104.2181730-2-maxime@cerno.tech --- drivers/gpu/drm/vc4/vc4_drv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index fad1d7c..4420907 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -281,7 +281,9 @@ static int vc4_drm_bind(struct device *dev) if (ret) goto dev_put; - drm_mode_config_init(drm); + ret = drmm_mode_config_init(drm); + if (ret) + goto dev_put; vc4_gem_init(drm); @@ -314,7 +316,6 @@ unbind_all: component_unbind_all(dev, drm); gem_destroy: vc4_gem_destroy(drm); - drm_mode_config_cleanup(drm); dev_put: drm_dev_put(drm); return ret; @@ -329,8 +330,6 @@ static void vc4_drm_unbind(struct device *dev) drm_atomic_helper_shutdown(drm); - drm_mode_config_cleanup(drm); - drm_atomic_private_obj_fini(&vc4->load_tracker); drm_atomic_private_obj_fini(&vc4->ctm_manager); -- 2.7.4