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

ASoC: simple-card-utils: Make simple_util_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.

simple_util_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 avatarHerve Codina <herve.codina@bootlin.com>
Link: https://lore.kernel.org/r/20231013221945.1489203-13-u.kleine-koenig@pengutronix.de


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

include/sound/simple_card_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ int simple_util_init_aux_jacks(struct simple_util_priv *priv, 
				char *prefix);

int simple_util_init_priv(struct simple_util_priv *priv,

			       struct link_info *li);

int simple_util_remove(struct platform_device *pdev);

void simple_util_remove(struct platform_device *pdev);



int graph_util_card_probe(struct snd_soc_card *card);

int graph_util_is_ports0(struct device_node *port);

sound/soc/generic/audio-graph-card.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static struct platform_driver graph_card = { 
		.of_match_table = graph_of_match,

	},

	.probe = graph_probe,

	.remove = simple_util_remove,

	.remove_new = simple_util_remove,

};

module_platform_driver(graph_card);

sound/soc/generic/audio-graph-card2-custom-sample.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static struct platform_driver custom_card = { 
		.of_match_table = custom_of_match,

	},

	.probe	= custom_probe,

	.remove	= simple_util_remove,

	.remove_new = simple_util_remove,

};

module_platform_driver(custom_card);

sound/soc/generic/audio-graph-card2.c

+1 −1
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static struct platform_driver graph_card = { 
		.of_match_table = graph_of_match,

	},

	.probe	= graph_probe,

	.remove	= simple_util_remove,

	.remove_new = simple_util_remove,

};

module_platform_driver(graph_card);

sound/soc/generic/simple-card-utils.c

+1 −3
Original line number Diff line number Diff line
@@ -958,13 +958,11 @@ int simple_util_init_priv(struct simple_util_priv *priv, 
}

EXPORT_SYMBOL_GPL(simple_util_init_priv);



int simple_util_remove(struct platform_device *pdev)

void simple_util_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	simple_util_clean_reference(card);



	return 0;

}

EXPORT_SYMBOL_GPL(simple_util_remove);