clk: hisilicon: Convert to platform remove callback returning void

Uwe Kleine-König · bebarino · commit bfa8370b283d · 2023-03-28T19:23:38.000-07:00
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 this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230312161512.2715500-18-u.kleine-koenig@pengutronix.de Signed-off-by: Stephen Boyd <sboyd@kernel.org>
diff --git a/drivers/clk/hisilicon/clk-hi3519.c b/drivers/clk/hisilicon/clk-hi3519.c
@@ -162,13 +162,12 @@ static int hi3519_clk_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int hi3519_clk_remove(struct platform_device *pdev)
+static void hi3519_clk_remove(struct platform_device *pdev)
 {
 	struct hi3519_crg_data *crg = platform_get_drvdata(pdev);
 
 	hisi_reset_exit(crg->rstc);
 	hi3519_clk_unregister(pdev);
-	return 0;
 }
 
 
@@ -180,7 +179,7 @@ MODULE_DEVICE_TABLE(of, hi3519_clk_match_table);
 
 static struct platform_driver hi3519_clk_driver = {
 	.probe          = hi3519_clk_probe,
-	.remove		= hi3519_clk_remove,
+	.remove_new	= hi3519_clk_remove,
 	.driver         = {
 		.name   = "hi3519-clk",
 		.of_match_table = hi3519_clk_match_table,
diff --git a/drivers/clk/hisilicon/clk-hi3559a.c b/drivers/clk/hisilicon/clk-hi3559a.c
@@ -810,18 +810,17 @@ static int hi3559av100_crg_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int hi3559av100_crg_remove(struct platform_device *pdev)
+static void hi3559av100_crg_remove(struct platform_device *pdev)
 {
 	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
 
 	hisi_reset_exit(crg->rstc);
 	crg->funcs->unregister_clks(pdev);
-	return 0;
 }
 
 static struct platform_driver hi3559av100_crg_driver = {
 	.probe		= hi3559av100_crg_probe,
-	.remove		= hi3559av100_crg_remove,
+	.remove_new	= hi3559av100_crg_remove,
 	.driver		= {
 		.name	= "hi3559av100-clock",
 		.of_match_table = hi3559av100_crg_match_table,
diff --git a/drivers/clk/hisilicon/crg-hi3516cv300.c b/drivers/clk/hisilicon/crg-hi3516cv300.c
@@ -284,18 +284,17 @@ static int hi3516cv300_crg_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int hi3516cv300_crg_remove(struct platform_device *pdev)
+static void hi3516cv300_crg_remove(struct platform_device *pdev)
 {
 	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
 
 	hisi_reset_exit(crg->rstc);
 	crg->funcs->unregister_clks(pdev);
-	return 0;
 }
 
 static struct platform_driver hi3516cv300_crg_driver = {
 	.probe          = hi3516cv300_crg_probe,
-	.remove		= hi3516cv300_crg_remove,
+	.remove_new	= hi3516cv300_crg_remove,
 	.driver         = {
 		.name   = "hi3516cv300-crg",
 		.of_match_table = hi3516cv300_crg_match_table,
diff --git a/drivers/clk/hisilicon/crg-hi3798cv200.c b/drivers/clk/hisilicon/crg-hi3798cv200.c
@@ -367,18 +367,17 @@ static int hi3798cv200_crg_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int hi3798cv200_crg_remove(struct platform_device *pdev)
+static void hi3798cv200_crg_remove(struct platform_device *pdev)
 {
 	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
 
 	hisi_reset_exit(crg->rstc);
 	crg->funcs->unregister_clks(pdev);
-	return 0;
 }
 
 static struct platform_driver hi3798cv200_crg_driver = {
 	.probe          = hi3798cv200_crg_probe,
-	.remove		= hi3798cv200_crg_remove,
+	.remove_new	= hi3798cv200_crg_remove,
 	.driver         = {
 		.name   = "hi3798cv200-crg",
 		.of_match_table = hi3798cv200_crg_match_table,

Original file line number	Diff line number	Diff line change
`@@ -162,13 +162,12 @@ static int hi3519_clk_probe(struct platform_device *pdev)`
`162`	`162`	`return 0;`
`163`	`163`	`}`
`164`	`164`
`165`		`-static int hi3519_clk_remove(struct platform_device *pdev)`
	`165`	`+static void hi3519_clk_remove(struct platform_device *pdev)`
`166`	`166`	`{`
`167`	`167`	`struct hi3519_crg_data *crg = platform_get_drvdata(pdev);`
`168`	`168`
`169`	`169`	`hisi_reset_exit(crg->rstc);`
`170`	`170`	`hi3519_clk_unregister(pdev);`
`171`		`- return 0;`
`172`	`171`	`}`
`173`	`172`
`174`	`173`
`@@ -180,7 +179,7 @@ MODULE_DEVICE_TABLE(of, hi3519_clk_match_table);`
`180`	`179`
`181`	`180`	`static struct platform_driver hi3519_clk_driver = {`
`182`	`181`	`.probe = hi3519_clk_probe,`
`183`		`- .remove = hi3519_clk_remove,`
	`182`	`+ .remove_new = hi3519_clk_remove,`
`184`	`183`	`.driver = {`
`185`	`184`	`.name = "hi3519-clk",`
`186`	`185`	`.of_match_table = hi3519_clk_match_table,`
Original file line number	Diff line number	Diff line change
`@@ -810,18 +810,17 @@ static int hi3559av100_crg_probe(struct platform_device *pdev)`
`810`	`810`	`return 0;`
`811`	`811`	`}`
`812`	`812`
`813`		`-static int hi3559av100_crg_remove(struct platform_device *pdev)`
	`813`	`+static void hi3559av100_crg_remove(struct platform_device *pdev)`
`814`	`814`	`{`
`815`	`815`	`struct hisi_crg_dev *crg = platform_get_drvdata(pdev);`
`816`	`816`
`817`	`817`	`hisi_reset_exit(crg->rstc);`
`818`	`818`	`crg->funcs->unregister_clks(pdev);`
`819`		`- return 0;`
`820`	`819`	`}`
`821`	`820`
`822`	`821`	`static struct platform_driver hi3559av100_crg_driver = {`
`823`	`822`	`.probe = hi3559av100_crg_probe,`
`824`		`- .remove = hi3559av100_crg_remove,`
	`823`	`+ .remove_new = hi3559av100_crg_remove,`
`825`	`824`	`.driver = {`
`826`	`825`	`.name = "hi3559av100-clock",`
`827`	`826`	`.of_match_table = hi3559av100_crg_match_table,`
Original file line number	Diff line number	Diff line change
`@@ -284,18 +284,17 @@ static int hi3516cv300_crg_probe(struct platform_device *pdev)`
`284`	`284`	`return 0;`
`285`	`285`	`}`
`286`	`286`
`287`		`-static int hi3516cv300_crg_remove(struct platform_device *pdev)`
	`287`	`+static void hi3516cv300_crg_remove(struct platform_device *pdev)`
`288`	`288`	`{`
`289`	`289`	`struct hisi_crg_dev *crg = platform_get_drvdata(pdev);`
`290`	`290`
`291`	`291`	`hisi_reset_exit(crg->rstc);`
`292`	`292`	`crg->funcs->unregister_clks(pdev);`
`293`		`- return 0;`
`294`	`293`	`}`
`295`	`294`
`296`	`295`	`static struct platform_driver hi3516cv300_crg_driver = {`
`297`	`296`	`.probe = hi3516cv300_crg_probe,`
`298`		`- .remove = hi3516cv300_crg_remove,`
	`297`	`+ .remove_new = hi3516cv300_crg_remove,`
`299`	`298`	`.driver = {`
`300`	`299`	`.name = "hi3516cv300-crg",`
`301`	`300`	`.of_match_table = hi3516cv300_crg_match_table,`
Original file line number	Diff line number	Diff line change
`@@ -367,18 +367,17 @@ static int hi3798cv200_crg_probe(struct platform_device *pdev)`
`367`	`367`	`return 0;`
`368`	`368`	`}`
`369`	`369`
`370`		`-static int hi3798cv200_crg_remove(struct platform_device *pdev)`
	`370`	`+static void hi3798cv200_crg_remove(struct platform_device *pdev)`
`371`	`371`	`{`
`372`	`372`	`struct hisi_crg_dev *crg = platform_get_drvdata(pdev);`
`373`	`373`
`374`	`374`	`hisi_reset_exit(crg->rstc);`
`375`	`375`	`crg->funcs->unregister_clks(pdev);`
`376`		`- return 0;`
`377`	`376`	`}`
`378`	`377`
`379`	`378`	`static struct platform_driver hi3798cv200_crg_driver = {`
`380`	`379`	`.probe = hi3798cv200_crg_probe,`
`381`		`- .remove = hi3798cv200_crg_remove,`
	`380`	`+ .remove_new = hi3798cv200_crg_remove,`
`382`	`381`	`.driver = {`
`383`	`382`	`.name = "hi3798cv200-crg",`
`384`	`383`	`.of_match_table = hi3798cv200_crg_match_table,`