Commit f574f377 authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Liviu Dudau
Browse files

drm/arm/malidp: remove calls to drm_mode_config_cleanup() 



drm_mode_config_init() simply calls drmm_mode_config_init(), hence
cleanup is automatically handled through registering
drm_mode_config_cleanup() with drmm_add_action_or_reset().

While at it, get rid of the deprecated drm_mode_config_init() and
replace it with drmm_mode_config_init() directly.

Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Signed-off-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221026155934.125294-6-dakr@redhat.com
parent 3ad51034

drivers/gpu/drm/arm/malidp_drv.c

+6 −14
Original line number Diff line number Diff line
@@ -396,7 +396,9 @@ static int malidp_init(struct drm_device *drm) 
	struct malidp_drm *malidp = drm_to_malidp(drm);

	struct malidp_hw_device *hwdev = malidp->dev;



	drm_mode_config_init(drm);

	ret = drmm_mode_config_init(drm);

	if (ret)

		goto out;



	drm->mode_config.min_width = hwdev->min_line_size;

	drm->mode_config.min_height = hwdev->min_line_size;
@@ -407,24 +409,16 @@ static int malidp_init(struct drm_device *drm) 


	ret = malidp_crtc_init(drm);

	if (ret)

		goto crtc_fail;

		goto out;



	ret = malidp_mw_connector_init(drm);

	if (ret)

		goto crtc_fail;



	return 0;

		goto out;



crtc_fail:

	drm_mode_config_cleanup(drm);

out:

	return ret;

}



static void malidp_fini(struct drm_device *drm)

{

	drm_mode_config_cleanup(drm);

}



static int malidp_irq_init(struct platform_device *pdev)

{

	int irq_de, irq_se, ret = 0;
@@ -874,7 +868,6 @@ static int malidp_bind(struct device *dev) 
bind_fail:

	of_node_put(malidp->crtc.port);

	malidp->crtc.port = NULL;

	malidp_fini(drm);

query_hw_fail:

	pm_runtime_put(dev);

	if (pm_runtime_enabled(dev))
@@ -902,7 +895,6 @@ static void malidp_unbind(struct device *dev) 
	component_unbind_all(dev, drm);

	of_node_put(malidp->crtc.port);

	malidp->crtc.port = NULL;

	malidp_fini(drm);

	pm_runtime_put(dev);

	if (pm_runtime_enabled(dev))

		pm_runtime_disable(dev);