Commit 18c62222 authored Mar 23, 2020 by Daniel Vetter

drm/mtk: 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)

Acked-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-41-daniel.vetter@ffwll.ch

parent e28c853e

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -162,7 +162,9 @@ static int mtk_drm_kms_init(struct drm_device *drm)
		}
		private->mutex_dev = &pdev->dev;

		drm_mode_config_init(drm);
		ret = drmm_mode_config_init(drm);
		if (ret)
		return ret;

		drm->mode_config.min_width = 64;
		drm->mode_config.min_height = 64;
		@@ -179,7 +181,7 @@ static int mtk_drm_kms_init(struct drm_device *drm)

		ret = component_bind_all(drm->dev, drm);
		if (ret)
		goto err_config_cleanup;
		return ret;

		/*
		* We currently support two fixed data streams, each optional,
		@@ -255,8 +257,6 @@ err_unset_dma_parms:
		dma_dev->dma_parms = NULL;
		err_component_unbind:
		component_unbind_all(drm->dev, drm);
		err_config_cleanup:
		drm_mode_config_cleanup(drm);

		return ret;
		}
		@@ -272,7 +272,6 @@ static void mtk_drm_kms_deinit(struct drm_device *drm)
		private->dma_dev->dma_parms = NULL;

		component_unbind_all(drm->dev, drm);
		drm_mode_config_cleanup(drm);
		}

		static const struct file_operations mtk_drm_fops = {

Admin message