Skip to content

Commit

Permalink
ASoC: ux500: mop500: Convert to platform remove callback returning void
Browse files Browse the repository at this point in the history
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: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20230315150745.67084-168-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and broonie committed Mar 20, 2023
1 parent 048d658 commit d2b6d5b
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions sound/soc/ux500/mop500.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static int mop500_probe(struct platform_device *pdev)
return ret;
}

static int mop500_remove(struct platform_device *pdev)
static void mop500_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

Expand All @@ -143,8 +143,6 @@ static int mop500_remove(struct platform_device *pdev)
snd_soc_unregister_card(card);
mop500_ab8500_remove(card);
mop500_of_node_put();

return 0;
}

static const struct of_device_id snd_soc_mop500_match[] = {
Expand All @@ -159,7 +157,7 @@ static struct platform_driver snd_soc_mop500_driver = {
.of_match_table = snd_soc_mop500_match,
},
.probe = mop500_probe,
.remove = mop500_remove,
.remove_new = mop500_remove,
};

module_platform_driver(snd_soc_mop500_driver);
Expand Down

0 comments on commit d2b6d5b

Please sign in to comment.