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

Commit 313665b9 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Remove card field from snd_soc_dai struct 



The card field of the snd_soc_dai field is very rarely used. We can use
dai->component->card instead and remove the card field from the snd_soc_dai
struct.

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

include/sound/soc-dai.h

+0 −2
Original line number Diff line number Diff line
@@ -275,8 +275,6 @@ struct snd_soc_dai { 
	unsigned int tx_mask;

	unsigned int rx_mask;



	struct snd_soc_card *card;



	struct list_head list;

};

sound/soc/soc-core.c

+1 −6
Original line number Diff line number Diff line
@@ -1315,11 +1315,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) 
	dev_dbg(card->dev, "ASoC: probe %s dai link %d late %d\n",

			card->name, num, order);



	/* config components */

	cpu_dai->card = card;

	for (i = 0; i < rtd->num_codecs; i++)

		rtd->codec_dais[i]->card = card;



	/* set default power off timeout */

	rtd->pmdown_time = pmdown_time;
@@ -2314,7 +2309,7 @@ EXPORT_SYMBOL_GPL(snd_soc_add_card_controls); 
int snd_soc_add_dai_controls(struct snd_soc_dai *dai,

	const struct snd_kcontrol_new *controls, int num_controls)

{

	struct snd_card *card = dai->card->snd_card;

	struct snd_card *card = dai->component->card->snd_card;



	return snd_soc_add_controls(card, dai->dev, controls, num_controls,

			NULL, dai);

sound/soc/soc-dapm.c

+1 −1
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget, 
int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

	struct snd_soc_dapm_widget_list **list)

{

	struct snd_soc_card *card = dai->card;

	struct snd_soc_card *card = dai->component->card;

	struct snd_soc_dapm_widget *w;

	int paths;