summaryrefslogtreecommitdiff
path: root/sound/drivers
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2023-03-15 16:04:58 +0100
committerMark Brown <broonie@kernel.org>2023-03-20 13:07:03 +0000
commit962bdc9645036b1300c4930e147b5e9a0c587c81 (patch)
treef21dd968745f78afd8022cadd91054c34098e674 /sound/drivers
parent5909d9e5b6c927ea91ace61365049a2f365a7d7e (diff)
downloadlwn-962bdc9645036b1300c4930e147b5e9a0c587c81.tar.gz
lwn-962bdc9645036b1300c4930e147b5e9a0c587c81.zip
ALSA: portman2x4: 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> Acked-by: Takashi Iwai <tiwai@suse.de> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Link: https://lore.kernel.org/r/20230315150745.67084-7-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/drivers')
-rw-r--r--sound/drivers/portman2x4.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index 52a656735365..a515c13a489f 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -795,20 +795,18 @@ __err:
return err;
}
-static int snd_portman_remove(struct platform_device *pdev)
+static void snd_portman_remove(struct platform_device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
if (card)
snd_card_free(card);
-
- return 0;
}
static struct platform_driver snd_portman_driver = {
.probe = snd_portman_probe,
- .remove = snd_portman_remove,
+ .remove_new = snd_portman_remove,
.driver = {
.name = PLATFORM_DRIVER,
}