Skip to content

Commit

Permalink
ALSA: pcmtest: 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 ignored (apart
from emitting a warning) 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. Eventually after all drivers
are converted, .remove_new() is renamed to .remove().

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: Ivan Orlov <ivan.orlov0322@gmail.com>
Link: https://lore.kernel.org/r/20230707075058.3402832-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Uwe Kleine-König authored and Takashi Iwai committed Jul 10, 2023
1 parent 06c2afb commit cb2bffd
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions sound/drivers/pcmtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -576,10 +576,9 @@ static int pcmtst_probe(struct platform_device *pdev)
return 0;
}

static int pdev_remove(struct platform_device *dev)
static void pdev_remove(struct platform_device *dev)
{
snd_pcmtst_free(pcmtst);
return 0;
}

static struct platform_device pcmtst_pdev = {
Expand All @@ -589,7 +588,7 @@ static struct platform_device pcmtst_pdev = {

static struct platform_driver pcmtst_pdrv = {
.probe = pcmtst_probe,
.remove = pdev_remove,
.remove_new = pdev_remove,
.driver = {
.name = "pcmtest",
},
Expand Down

0 comments on commit cb2bffd

Please sign in to comment.