Commit 4b055ab1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/mcde: Drop explicit drm_mode_config_cleanup call 



Allows us to drop the drm_driver.release callback.

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().

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

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

Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org> (v2)
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-33-daniel.vetter@ffwll.ch
parent fe1cc102

drivers/gpu/drm/mcde/mcde_drv.c

+6 −14
Original line number Diff line number Diff line
@@ -184,13 +184,13 @@ static int mcde_modeset_init(struct drm_device *drm) 
	ret = drm_vblank_init(drm, 1);

	if (ret) {

		dev_err(drm->dev, "failed to init vblank\n");

		goto out_config;

		return ret;

	}



	ret = mcde_display_init(drm);

	if (ret) {

		dev_err(drm->dev, "failed to init display\n");

		goto out_config;

		return ret;

	}



	/*
@@ -204,7 +204,7 @@ static int mcde_modeset_init(struct drm_device *drm) 
						    mcde->bridge);

	if (ret) {

		dev_err(drm->dev, "failed to attach display output bridge\n");

		goto out_config;

		return ret;

	}



	drm_mode_config_reset(drm);
@@ -212,15 +212,6 @@ static int mcde_modeset_init(struct drm_device *drm) 
	drm_fbdev_generic_setup(drm, 32);



	return 0;



out_config:

	drm_mode_config_cleanup(drm);

	return ret;

}



static void mcde_release(struct drm_device *drm)

{

	drm_mode_config_cleanup(drm);

}



DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
@@ -228,7 +219,6 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops); 
static struct drm_driver mcde_drm_driver = {

	.driver_features =

		DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,

	.release = mcde_release,

	.lastclose = drm_fb_helper_lastclose,

	.ioctls = NULL,

	.fops = &drm_fops,
@@ -256,7 +246,9 @@ static int mcde_drm_bind(struct device *dev) 
	struct drm_device *drm = dev_get_drvdata(dev);

	int ret;



	drm_mode_config_init(drm);

	ret = drmm_mode_config_init(drm);

	if (ret)

		return ret;



	ret = component_bind_all(drm->dev, drm);

	if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE