Unverified Commit 8210f496 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

ASoC: meson: Make meson_card_remove() return 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.

meson_card_remove() returned zero unconditionally. Make it return void
instead and convert all users to struct platform_device::remove_new().

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20231013221945.1489203-14-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 393df6f3

sound/soc/meson/axg-card.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ MODULE_DEVICE_TABLE(of, axg_card_of_match); 


static struct platform_driver axg_card_pdrv = {

	.probe = meson_card_probe,

	.remove = meson_card_remove,

	.remove_new = meson_card_remove,

	.driver = {

		.name = "axg-sound-card",

		.of_match_table = axg_card_of_match,

sound/soc/meson/gx-card.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ MODULE_DEVICE_TABLE(of, gx_card_of_match); 


static struct platform_driver gx_card_pdrv = {

	.probe = meson_card_probe,

	.remove = meson_card_remove,

	.remove_new = meson_card_remove,

	.driver = {

		.name = "gx-sound-card",

		.of_match_table = gx_card_of_match,

sound/soc/meson/meson-card-utils.c

+1 −3
Original line number Diff line number Diff line
@@ -327,13 +327,11 @@ int meson_card_probe(struct platform_device *pdev) 
}

EXPORT_SYMBOL_GPL(meson_card_probe);



int meson_card_remove(struct platform_device *pdev)

void meson_card_remove(struct platform_device *pdev)

{

	struct meson_card *priv = platform_get_drvdata(pdev);



	meson_card_clean_references(priv);



	return 0;

}

EXPORT_SYMBOL_GPL(meson_card_remove);

sound/soc/meson/meson-card.h

+1 −1
Original line number Diff line number Diff line
@@ -49,6 +49,6 @@ int meson_card_set_fe_link(struct snd_soc_card *card, 
			   bool is_playback);



int meson_card_probe(struct platform_device *pdev);

int meson_card_remove(struct platform_device *pdev);

void meson_card_remove(struct platform_device *pdev);



#endif /* _MESON_SND_CARD_H */