drm/shmob: Drop explicit drm_mode_config_cleanup call

It's right above the drm_dev_put().

This is made possible by a preceeding patch which added a drmm_
cleanup action to drm_mode_config_init(), hence all we need to do to
ensure that drm_mode_config_cleanup() is run on final drm_device
cleanup is check the new error code for _init().

Aside: Another driver with a bit much devm_kzalloc, which should
probably use drmm_kzalloc instead ...

v2: Explain why this cleanup is possible (Laurent).

v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas)

Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> (v2)
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: linux-renesas-soc@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-40-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index b8c0930959c7e84bb0ec9b7d1a96a10bcd338c65..ae9d6b8d3ca8764f2b6c63ffb0d61c51e1b3ced5 100644 (file)
--- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -192,7 +192,6 @@ static int shmob_drm_remove(struct platform_device *pdev)
 
        drm_dev_unregister(ddev);
        drm_kms_helper_poll_fini(ddev);
-       drm_mode_config_cleanup(ddev);
        drm_irq_uninstall(ddev);
        drm_dev_put(ddev);
 
@@ -288,7 +287,6 @@ err_irq_uninstall:
        drm_irq_uninstall(ddev);
 err_modeset_cleanup:
        drm_kms_helper_poll_fini(ddev);
-       drm_mode_config_cleanup(ddev);
 err_free_drm_dev:
        drm_dev_put(ddev);
 

diff --git a/drivers/gpu/drm/shmobile/shmob_drm_kms.c b/drivers/gpu/drm/shmobile/shmob_drm_kms.c
index c51197b6fd8547420c1ba14c151dfc82e5510296..7a866d6ce6bb56461fc0efe8838c59a79f0dd453 100644 (file)
--- a/drivers/gpu/drm/shmobile/shmob_drm_kms.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_kms.c
@@ -126,7 +126,11 @@ static const struct drm_mode_config_funcs shmob_drm_mode_config_funcs = {
 
 int shmob_drm_modeset_init(struct shmob_drm_device *sdev)
 {
-       drm_mode_config_init(sdev->ddev);
+       int ret;
+
+       ret = drmm_mode_config_init(sdev->ddev);
+       if (ret)
+               return ret;
 
        shmob_drm_crtc_create(sdev);
        shmob_drm_encoder_create(sdev);