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 <[email protected]>
---
 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 eb3fcd8232b5..0bcc541486a9 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -269,7 +269,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);
 
@@ -302,7 +304,6 @@ static int vc4_drm_bind(struct device *dev)
        component_unbind_all(dev, drm);
 gem_destroy:
        vc4_gem_destroy(drm);
-       drm_mode_config_cleanup(drm);
 dev_put:
        drm_dev_put(drm);
        return ret;
@@ -317,8 +318,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.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to