Skip to content

Commit

Permalink
ASoC: xtensa: xtfpga-i2s: Convert to platform remove callback returni…
Browse files Browse the repository at this point in the history
…ng 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>
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20230315150745.67084-172-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and Mark Brown committed Mar 20, 2023
1 parent 407a27b commit cbde81b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions sound/soc/xtensa/xtfpga-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ static int xtfpga_i2s_probe(struct platform_device *pdev)
return err;
}

static int xtfpga_i2s_remove(struct platform_device *pdev)
static void xtfpga_i2s_remove(struct platform_device *pdev)
{
struct xtfpga_i2s *i2s = dev_get_drvdata(&pdev->dev);

Expand All @@ -618,7 +618,6 @@ static int xtfpga_i2s_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
if (!pm_runtime_status_suspended(&pdev->dev))
xtfpga_i2s_runtime_suspend(&pdev->dev);
return 0;
}

#ifdef CONFIG_OF
Expand All @@ -636,7 +635,7 @@ static const struct dev_pm_ops xtfpga_i2s_pm_ops = {

static struct platform_driver xtfpga_i2s_driver = {
.probe = xtfpga_i2s_probe,
.remove = xtfpga_i2s_remove,
.remove_new = xtfpga_i2s_remove,
.driver = {
.name = "xtfpga-i2s",
.of_match_table = of_match_ptr(xtfpga_i2s_of_match),
Expand Down

0 comments on commit cbde81b

Please sign in to comment.