[37/51] drm/rockchip: Drop explicit drm_mode_config_cleanup call
diff mbox series

Message ID 20200323144950.3018436-38-daniel.vetter@ffwll.ch
State New
Headers show
  • drm_device managed resources, v5
Related show

Commit Message

Daniel Vetter March 23, 2020, 2:49 p.m. UTC
It's (almost, there's some iommu stuff without significance) 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: Jump out at the right label (Francesco)

v4: Try again, kbuild caught that I didn't build test this properly

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

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Francesco Lavra <francescolavra.fl@gmail.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff mbox series

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 20ecb1508a22..0f3eb392fe39 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -135,14 +135,16 @@  static int rockchip_drm_bind(struct device *dev)
 	if (ret)
 		goto err_free;
-	drm_mode_config_init(drm_dev);
+	ret = drmm_mode_config_init(drm_dev);
+	if (ret)
+		goto err_iommu_cleanup;
 	/* Try to bind all sub drivers. */
 	ret = component_bind_all(dev, drm_dev);
 	if (ret)
-		goto err_mode_config_cleanup;
+		goto err_iommu_cleanup;
 	ret = drm_vblank_init(drm_dev, drm_dev->mode_config.num_crtc);
 	if (ret)
@@ -173,12 +175,9 @@  static int rockchip_drm_bind(struct device *dev)
 	component_unbind_all(dev, drm_dev);
-	drm_mode_config_cleanup(drm_dev);
-	drm_dev->dev_private = NULL;
-	dev_set_drvdata(dev, NULL);
 	return ret;
@@ -194,11 +193,8 @@  static void rockchip_drm_unbind(struct device *dev)
 	component_unbind_all(dev, drm_dev);
-	drm_mode_config_cleanup(drm_dev);
-	drm_dev->dev_private = NULL;
-	dev_set_drvdata(dev, NULL);