ASoC: atmel: sam9g20_wm8731: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 15 Mar 2023 15:05:23 +0000 (16:05 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 20 Mar 2023 13:07:26 +0000 (13:07 +0000)
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>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20230315150745.67084-32-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/atmel/sam9g20_wm8731.c

index 785b9d01d8afeb9b34dad6fb7a320a82b5080461..baf38964b49151fae43572087de7ba6aa18c7388 100644 (file)
@@ -186,14 +186,12 @@ err:
        return ret;
 }
 
-static int at91sam9g20ek_audio_remove(struct platform_device *pdev)
+static void at91sam9g20ek_audio_remove(struct platform_device *pdev)
 {
        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
        snd_soc_unregister_card(card);
        atmel_ssc_put_audio(0);
-
-       return 0;
 }
 
 #ifdef CONFIG_OF
@@ -210,7 +208,7 @@ static struct platform_driver at91sam9g20ek_audio_driver = {
                .of_match_table = of_match_ptr(at91sam9g20ek_wm8731_dt_ids),
        },
        .probe  = at91sam9g20ek_audio_probe,
-       .remove = at91sam9g20ek_audio_remove,
+       .remove_new = at91sam9g20ek_audio_remove,
 };
 
 module_platform_driver(at91sam9g20ek_audio_driver);