diff mbox series

[141/173] ASoC: sunxi: sun4i-i2s: Convert to platform remove callback returning void

Message ID 20230315150745.67084-142-u.kleine-koenig@pengutronix.de (mailing list archive)
State Accepted
Commit 5423c00ee28f6cc3013b74bd1ac4090c625e91c2
Headers show
Series ALSA/ASoC: Convert to platform remove callback returning void | expand

Commit Message

Uwe Kleine-König March 15, 2023, 3:07 p.m. UTC
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>
---
 sound/soc/sunxi/sun4i-i2s.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Jernej Škrabec March 15, 2023, 4:04 p.m. UTC | #1
Dne sreda, 15. marec 2023 ob 16:07:13 CET je Uwe Kleine-König napisal(a):
> 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>

Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>

Best regards,
Jernej

> ---
>  sound/soc/sunxi/sun4i-i2s.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
> index 6028871825ba..669d712bbe9f 100644
> --- a/sound/soc/sunxi/sun4i-i2s.c
> +++ b/sound/soc/sunxi/sun4i-i2s.c
> @@ -1606,7 +1606,7 @@ static int sun4i_i2s_probe(struct platform_device
> *pdev) return ret;
>  }
> 
> -static int sun4i_i2s_remove(struct platform_device *pdev)
> +static void sun4i_i2s_remove(struct platform_device *pdev)
>  {
>  	struct sun4i_i2s *i2s = dev_get_drvdata(&pdev->dev);
> 
> @@ -1616,8 +1616,6 @@ static int sun4i_i2s_remove(struct platform_device
> *pdev)
> 
>  	if (!IS_ERR(i2s->rst))
>  		reset_control_assert(i2s->rst);
> -
> -	return 0;
>  }
> 
>  static const struct of_device_id sun4i_i2s_match[] = {
> @@ -1660,7 +1658,7 @@ static const struct dev_pm_ops sun4i_i2s_pm_ops = {
> 
>  static struct platform_driver sun4i_i2s_driver = {
>  	.probe	= sun4i_i2s_probe,
> -	.remove	= sun4i_i2s_remove,
> +	.remove_new = sun4i_i2s_remove,
>  	.driver	= {
>  		.name		= "sun4i-i2s",
>  		.of_match_table	= sun4i_i2s_match,
diff mbox series

Patch

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 6028871825ba..669d712bbe9f 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1606,7 +1606,7 @@  static int sun4i_i2s_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int sun4i_i2s_remove(struct platform_device *pdev)
+static void sun4i_i2s_remove(struct platform_device *pdev)
 {
 	struct sun4i_i2s *i2s = dev_get_drvdata(&pdev->dev);
 
@@ -1616,8 +1616,6 @@  static int sun4i_i2s_remove(struct platform_device *pdev)
 
 	if (!IS_ERR(i2s->rst))
 		reset_control_assert(i2s->rst);
-
-	return 0;
 }
 
 static const struct of_device_id sun4i_i2s_match[] = {
@@ -1660,7 +1658,7 @@  static const struct dev_pm_ops sun4i_i2s_pm_ops = {
 
 static struct platform_driver sun4i_i2s_driver = {
 	.probe	= sun4i_i2s_probe,
-	.remove	= sun4i_i2s_remove,
+	.remove_new = sun4i_i2s_remove,
 	.driver	= {
 		.name		= "sun4i-i2s",
 		.of_match_table	= sun4i_i2s_match,