Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f6e7d52 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Remove unused dapm_get_snd_card() and dapm_get_soc_card() 



These two functions were added two years ago in commit 4805608a ("ASoC: dapm -
Add methods to retrieve snd_card and soc_card from dapm context.") but have
remained unused so far. Considering that the dapm context actually has a direct
pointer to the card the functions also seem to be unnecessary. E.g. the
expressions 'dapm_get_soc_card(dapm)' and 'dapm->card' yield the same result.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e6058aaa

sound/soc/soc-dapm.c

+0 −30
Original line number Diff line number Diff line
@@ -174,36 +174,6 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget( 
	return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL);

}



/* get snd_card from DAPM context */

static inline struct snd_card *dapm_get_snd_card(

	struct snd_soc_dapm_context *dapm)

{

	if (dapm->codec)

		return dapm->codec->card->snd_card;

	else if (dapm->platform)

		return dapm->platform->card->snd_card;

	else

		BUG();



	/* unreachable */

	return NULL;

}



/* get soc_card from DAPM context */

static inline struct snd_soc_card *dapm_get_soc_card(

		struct snd_soc_dapm_context *dapm)

{

	if (dapm->codec)

		return dapm->codec->card;

	else if (dapm->platform)

		return dapm->platform->card;

	else

		BUG();



	/* unreachable */

	return NULL;

}



static void dapm_reset(struct snd_soc_card *card)

{

	struct snd_soc_dapm_widget *w;