Commit d665e3c9 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Douglas Anderson
Browse files

drm/sun4i: 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 sun4i drm drivers from always returning zero in
the remove callback to the void returning variant.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230507162616.1368908-44-u.kleine-koenig@pengutronix.de
parent 0c259ab1

drivers/gpu/drm/sun4i/sun4i_backend.c

+2 −4
Original line number Diff line number Diff line
@@ -965,11 +965,9 @@ static int sun4i_backend_probe(struct platform_device *pdev) 
	return component_add(&pdev->dev, &sun4i_backend_ops);

}



static int sun4i_backend_remove(struct platform_device *pdev)

static void sun4i_backend_remove(struct platform_device *pdev)

{

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



	return 0;

}



static const struct sun4i_backend_quirks sun4i_backend_quirks = {
@@ -1028,7 +1026,7 @@ MODULE_DEVICE_TABLE(of, sun4i_backend_of_table); 


static struct platform_driver sun4i_backend_platform_driver = {

	.probe		= sun4i_backend_probe,

	.remove		= sun4i_backend_remove,

	.remove_new	= sun4i_backend_remove,

	.driver		= {

		.name		= "sun4i-backend",

		.of_match_table	= sun4i_backend_of_table,

drivers/gpu/drm/sun4i/sun4i_drv.c

+2 −4
Original line number Diff line number Diff line
@@ -408,11 +408,9 @@ static int sun4i_drv_probe(struct platform_device *pdev) 
		return 0;

}



static int sun4i_drv_remove(struct platform_device *pdev)

static void sun4i_drv_remove(struct platform_device *pdev)

{

	component_master_del(&pdev->dev, &sun4i_drv_master_ops);



	return 0;

}



static const struct of_device_id sun4i_drv_of_table[] = {
@@ -438,7 +436,7 @@ MODULE_DEVICE_TABLE(of, sun4i_drv_of_table); 


static struct platform_driver sun4i_drv_platform_driver = {

	.probe		= sun4i_drv_probe,

	.remove		= sun4i_drv_remove,

	.remove_new	= sun4i_drv_remove,

	.driver		= {

		.name		= "sun4i-drm",

		.of_match_table	= sun4i_drv_of_table,

drivers/gpu/drm/sun4i/sun4i_frontend.c

+2 −4
Original line number Diff line number Diff line
@@ -634,11 +634,9 @@ static int sun4i_frontend_probe(struct platform_device *pdev) 
	return component_add(&pdev->dev, &sun4i_frontend_ops);

}



static int sun4i_frontend_remove(struct platform_device *pdev)

static void sun4i_frontend_remove(struct platform_device *pdev)

{

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



	return 0;

}



static int sun4i_frontend_runtime_resume(struct device *dev)
@@ -719,7 +717,7 @@ MODULE_DEVICE_TABLE(of, sun4i_frontend_of_table); 


static struct platform_driver sun4i_frontend_driver = {

	.probe		= sun4i_frontend_probe,

	.remove		= sun4i_frontend_remove,

	.remove_new	= sun4i_frontend_remove,

	.driver		= {

		.name		= "sun4i-frontend",

		.of_match_table	= sun4i_frontend_of_table,

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+2 −4
Original line number Diff line number Diff line
@@ -693,11 +693,9 @@ static int sun4i_hdmi_probe(struct platform_device *pdev) 
	return component_add(&pdev->dev, &sun4i_hdmi_ops);

}



static int sun4i_hdmi_remove(struct platform_device *pdev)

static void sun4i_hdmi_remove(struct platform_device *pdev)

{

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



	return 0;

}



static const struct of_device_id sun4i_hdmi_of_table[] = {
@@ -710,7 +708,7 @@ MODULE_DEVICE_TABLE(of, sun4i_hdmi_of_table); 


static struct platform_driver sun4i_hdmi_driver = {

	.probe		= sun4i_hdmi_probe,

	.remove		= sun4i_hdmi_remove,

	.remove_new	= sun4i_hdmi_remove,

	.driver		= {

		.name		= "sun4i-hdmi",

		.of_match_table	= sun4i_hdmi_of_table,

drivers/gpu/drm/sun4i/sun4i_tcon.c

+2 −4
Original line number Diff line number Diff line
@@ -1331,11 +1331,9 @@ static int sun4i_tcon_probe(struct platform_device *pdev) 
	return component_add(&pdev->dev, &sun4i_tcon_ops);

}



static int sun4i_tcon_remove(struct platform_device *pdev)

static void sun4i_tcon_remove(struct platform_device *pdev)

{

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



	return 0;

}



/* platform specific TCON muxing callbacks */
@@ -1570,7 +1568,7 @@ EXPORT_SYMBOL(sun4i_tcon_of_table); 


static struct platform_driver sun4i_tcon_platform_driver = {

	.probe		= sun4i_tcon_probe,

	.remove		= sun4i_tcon_remove,

	.remove_new	= sun4i_tcon_remove,

	.driver		= {

		.name		= "sun4i-tcon",

		.of_match_table	= sun4i_tcon_of_table,