diff mbox series

[v2,46/61] mmc: atmel-mci: Convert to platform remove callback returning void

Message ID 20230726040041.26267-46-frank.li@vivo.com
State New
Headers
Series [v2,01/61] mmc: sunxi: Convert to platform remove callback returning void |

Commit Message

李扬韬 July 26, 2023, 4 a.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.

Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/mmc/host/atmel-mci.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

claudiu beznea July 27, 2023, 5:41 a.m. UTC | #1 
On 26.07.2023 07:00, Yangtao Li wrote:
> 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.
> 
> Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>

Reviewed-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>

> ---
>   drivers/mmc/host/atmel-mci.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index dd18440a90c5..b4ae9aa939a5 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -2600,7 +2600,7 @@ static int atmci_probe(struct platform_device *pdev)
>   	return ret;
>   }
>   
> -static int atmci_remove(struct platform_device *pdev)
> +static void atmci_remove(struct platform_device *pdev)
>   {
>   	struct atmel_mci	*host = platform_get_drvdata(pdev);
>   	unsigned int		i;
> @@ -2630,8 +2630,6 @@ static int atmci_remove(struct platform_device *pdev)
>   
>   	pm_runtime_disable(&pdev->dev);
>   	pm_runtime_put_noidle(&pdev->dev);
> -
> -	return 0;
>   }
>   
>   #ifdef CONFIG_PM
> @@ -2664,7 +2662,7 @@ static const struct dev_pm_ops atmci_dev_pm_ops = {
>   
>   static struct platform_driver atmci_driver = {
>   	.probe		= atmci_probe,
> -	.remove		= atmci_remove,
> +	.remove_new	= atmci_remove,
>   	.driver		= {
>   		.name		= "atmel_mci",
>   		.probe_type	= PROBE_PREFER_ASYNCHRONOUS,
diff mbox series

Patch

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index dd18440a90c5..b4ae9aa939a5 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2600,7 +2600,7 @@  static int atmci_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int atmci_remove(struct platform_device *pdev)
+static void atmci_remove(struct platform_device *pdev)
 {
 	struct atmel_mci	*host = platform_get_drvdata(pdev);
 	unsigned int		i;
@@ -2630,8 +2630,6 @@  static int atmci_remove(struct platform_device *pdev)
 
 	pm_runtime_disable(&pdev->dev);
 	pm_runtime_put_noidle(&pdev->dev);
-
-	return 0;
 }
 
 #ifdef CONFIG_PM
@@ -2664,7 +2662,7 @@  static const struct dev_pm_ops atmci_dev_pm_ops = {
 
 static struct platform_driver atmci_driver = {
 	.probe		= atmci_probe,
-	.remove		= atmci_remove,
+	.remove_new	= atmci_remove,
 	.driver		= {
 		.name		= "atmel_mci",
 		.probe_type	= PROBE_PREFER_ASYNCHRONOUS,