diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2023-10-14 00:19:47 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-10-23 14:29:42 +0200 |
| commit | 46dd58bef32dea55b663141858ca1659a85a1505 (patch) | |
| tree | 01dc61f52c066129eb1e5f0068f0bb067b9ee98a | |
| parent | ASoC: Intel: more machine driver updates for 6.7 (diff) | |
| download | linux-46dd58bef32dea55b663141858ca1659a85a1505.tar.xz linux-46dd58bef32dea55b663141858ca1659a85a1505.zip | |
ASoC: rockchip: i2s_tdm: 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 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/20231013221945.1489203-10-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/rockchip/rockchip_i2s_tdm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 7e996550d1df..5c51dbef6e86 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -1714,14 +1714,12 @@ err_disable_hclk: return ret; } -static int rockchip_i2s_tdm_remove(struct platform_device *pdev) +static void rockchip_i2s_tdm_remove(struct platform_device *pdev) { if (!pm_runtime_status_suspended(&pdev->dev)) i2s_tdm_runtime_suspend(&pdev->dev); pm_runtime_disable(&pdev->dev); - - return 0; } static int __maybe_unused rockchip_i2s_tdm_suspend(struct device *dev) @@ -1756,7 +1754,7 @@ static const struct dev_pm_ops rockchip_i2s_tdm_pm_ops = { static struct platform_driver rockchip_i2s_tdm_driver = { .probe = rockchip_i2s_tdm_probe, - .remove = rockchip_i2s_tdm_remove, + .remove_new = rockchip_i2s_tdm_remove, .driver = { .name = DRV_NAME, .of_match_table = of_match_ptr(rockchip_i2s_tdm_match), |