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

ASoC: simple-card-utils: Make asoc_simple_clean_reference() return void 



asoc_simple_clean_reference() returns zero unconditionally. Letting it
return void instead makes it easier to see in the caller that there is no
error to handle.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20220605153537.26591-1-u.kleine-koenig@pengutronix.de


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

include/sound/simple_card_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ void asoc_simple_canonicalize_platform(struct snd_soc_dai_link_component *platfo 
void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link_component *cpus,

				  int is_single_links);



int asoc_simple_clean_reference(struct snd_soc_card *card);

void asoc_simple_clean_reference(struct snd_soc_card *card);



void asoc_simple_convert_fixup(struct asoc_simple_data *data,

				      struct snd_pcm_hw_params *params);

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

+4 −3
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link_component *cpus, 
}

EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_cpu);



int asoc_simple_clean_reference(struct snd_soc_card *card)

void asoc_simple_clean_reference(struct snd_soc_card *card)

{

	struct snd_soc_dai_link *dai_link;

	struct snd_soc_dai_link_component *cpu;
@@ -622,7 +622,6 @@ int asoc_simple_clean_reference(struct snd_soc_card *card) 
		for_each_link_codecs(dai_link, j, codec)

			of_node_put(codec->of_node);

	}

	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_clean_reference);
@@ -877,7 +876,9 @@ int asoc_simple_remove(struct platform_device *pdev) 
{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	return asoc_simple_clean_reference(card);

	asoc_simple_clean_reference(card);



	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_remove);