ASoC: rockchip: rockchip_pdm: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 15 Mar 2023 15:06:53 +0000 (16:06 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 20 Mar 2023 13:08:48 +0000 (13:08 +0000)
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: Takashi Iwai <tiwai@suse.de>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20230315150745.67084-122-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/rockchip/rockchip_pdm.c

index 6ce92b1..52f9aae 100644 (file)
@@ -661,7 +661,7 @@ err_pm_disable:
        return ret;
 }
 
-static int rockchip_pdm_remove(struct platform_device *pdev)
+static void rockchip_pdm_remove(struct platform_device *pdev)
 {
        struct rk_pdm_dev *pdm = dev_get_drvdata(&pdev->dev);
 
@@ -671,8 +671,6 @@ static int rockchip_pdm_remove(struct platform_device *pdev)
 
        clk_disable_unprepare(pdm->clk);
        clk_disable_unprepare(pdm->hclk);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -710,7 +708,7 @@ static const struct dev_pm_ops rockchip_pdm_pm_ops = {
 
 static struct platform_driver rockchip_pdm_driver = {
        .probe  = rockchip_pdm_probe,
-       .remove = rockchip_pdm_remove,
+       .remove_new = rockchip_pdm_remove,
        .driver = {
                .name = "rockchip-pdm",
                .of_match_table = of_match_ptr(rockchip_pdm_match),