Commit b3af12a0 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Convert to platform remove callback returning void 



The .remove() callback for a platform driver returns an int which makes
many driver authors wrongly assume it's possible to do error handling by
returning an error code. However the value returned is (mostly) ignored
and this typically results in resource leaks. To improve here there is a
quest to make the remove callback return void. In the first step of this
quest all drivers are converted to .remove_new() which already returns
void.

Trivially convert the mediatek drm drivers from always returning zero in
the remove callback to the void returning variant.

Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJyri Sarha <jyri.sarha@iki.fi>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20230801110239.831099-8-u.kleine-koenig@pengutronix.de/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 61a97dec

drivers/gpu/drm/mediatek/mtk_cec.c

+2 −3
Original line number Diff line number Diff line
@@ -235,13 +235,12 @@ static int mtk_cec_probe(struct platform_device *pdev) 
	return 0;

}



static int mtk_cec_remove(struct platform_device *pdev)

static void mtk_cec_remove(struct platform_device *pdev)

{

	struct mtk_cec *cec = platform_get_drvdata(pdev);



	mtk_cec_htplg_irq_disable(cec);

	clk_disable_unprepare(cec->clk);

	return 0;

}



static const struct of_device_id mtk_cec_of_ids[] = {
@@ -252,7 +251,7 @@ MODULE_DEVICE_TABLE(of, mtk_cec_of_ids); 


struct platform_driver mtk_cec_driver = {

	.probe = mtk_cec_probe,

	.remove = mtk_cec_remove,

	.remove_new = mtk_cec_remove,

	.driver = {

		.name = "mediatek-cec",

		.of_match_table = mtk_cec_of_ids,

drivers/gpu/drm/mediatek/mtk_disp_aal.c

+2 −4
Original line number Diff line number Diff line
@@ -140,11 +140,9 @@ static int mtk_disp_aal_probe(struct platform_device *pdev) 
	return ret;

}



static int mtk_disp_aal_remove(struct platform_device *pdev)

static void mtk_disp_aal_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &mtk_disp_aal_component_ops);



	return 0;

}



static const struct mtk_disp_aal_data mt8173_aal_driver_data = {
@@ -161,7 +159,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_aal_driver_dt_match); 


struct platform_driver mtk_disp_aal_driver = {

	.probe		= mtk_disp_aal_probe,

	.remove		= mtk_disp_aal_remove,

	.remove_new	= mtk_disp_aal_remove,

	.driver		= {

		.name	= "mediatek-disp-aal",

		.owner	= THIS_MODULE,

drivers/gpu/drm/mediatek/mtk_disp_ccorr.c

+2 −4
Original line number Diff line number Diff line
@@ -195,11 +195,9 @@ static int mtk_disp_ccorr_probe(struct platform_device *pdev) 
	return ret;

}



static int mtk_disp_ccorr_remove(struct platform_device *pdev)

static void mtk_disp_ccorr_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &mtk_disp_ccorr_component_ops);



	return 0;

}



static const struct mtk_disp_ccorr_data mt8183_ccorr_driver_data = {
@@ -221,7 +219,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_ccorr_driver_dt_match); 


struct platform_driver mtk_disp_ccorr_driver = {

	.probe		= mtk_disp_ccorr_probe,

	.remove		= mtk_disp_ccorr_remove,

	.remove_new	= mtk_disp_ccorr_remove,

	.driver		= {

		.name	= "mediatek-disp-ccorr",

		.owner	= THIS_MODULE,

drivers/gpu/drm/mediatek/mtk_disp_color.c

+2 −4
Original line number Diff line number Diff line
@@ -132,11 +132,9 @@ static int mtk_disp_color_probe(struct platform_device *pdev) 
	return ret;

}



static int mtk_disp_color_remove(struct platform_device *pdev)

static void mtk_disp_color_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &mtk_disp_color_component_ops);



	return 0;

}



static const struct mtk_disp_color_data mt2701_color_driver_data = {
@@ -164,7 +162,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_color_driver_dt_match); 


struct platform_driver mtk_disp_color_driver = {

	.probe		= mtk_disp_color_probe,

	.remove		= mtk_disp_color_remove,

	.remove_new	= mtk_disp_color_remove,

	.driver		= {

		.name	= "mediatek-disp-color",

		.owner	= THIS_MODULE,

drivers/gpu/drm/mediatek/mtk_disp_gamma.c

+2 −4
Original line number Diff line number Diff line
@@ -183,11 +183,9 @@ static int mtk_disp_gamma_probe(struct platform_device *pdev) 
	return ret;

}



static int mtk_disp_gamma_remove(struct platform_device *pdev)

static void mtk_disp_gamma_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &mtk_disp_gamma_component_ops);



	return 0;

}



static const struct mtk_disp_gamma_data mt8173_gamma_driver_data = {
@@ -209,7 +207,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_gamma_driver_dt_match); 


struct platform_driver mtk_disp_gamma_driver = {

	.probe		= mtk_disp_gamma_probe,

	.remove		= mtk_disp_gamma_remove,

	.remove_new	= mtk_disp_gamma_remove,

	.driver		= {

		.name	= "mediatek-disp-gamma",

		.owner	= THIS_MODULE,