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

Commit 24faf765 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Remove card's DAI list 



Commit f0fba2ad ("ASoC: multi-component - ASoC Multi-Component Support") added
a per card list that keeps track of all the DAIs that have been registered with
the card, but the list has never been used. This patch removes it again.

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

include/sound/soc-dai.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -277,7 +277,6 @@ struct snd_soc_dai { 
	struct snd_soc_card *card;

	struct snd_soc_card *card;





	struct list_head list;

	struct list_head list;

	struct list_head card_list;

};

};





static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai,

static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai,

include/sound/soc.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -1021,7 +1021,6 @@ struct snd_soc_card { 
	/* lists of probed devices belonging to this card */

	/* lists of probed devices belonging to this card */

	struct list_head codec_dev_list;

	struct list_head codec_dev_list;

	struct list_head platform_dev_list;

	struct list_head platform_dev_list;

	struct list_head dai_dev_list;





	struct list_head widgets;

	struct list_head widgets;

	struct list_head paths;

	struct list_head paths;
@@ -1207,7 +1206,6 @@ static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd) 




static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)

static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)

{

{

	INIT_LIST_HEAD(&card->dai_dev_list);

	INIT_LIST_HEAD(&card->codec_dev_list);

	INIT_LIST_HEAD(&card->codec_dev_list);

	INIT_LIST_HEAD(&card->platform_dev_list);

	INIT_LIST_HEAD(&card->platform_dev_list);

	INIT_LIST_HEAD(&card->widgets);

	INIT_LIST_HEAD(&card->widgets);

sound/soc/soc-core.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -1017,7 +1017,6 @@ static void soc_remove_codec_dai(struct snd_soc_dai *codec_dai, int order) 
					codec_dai->name, err);

					codec_dai->name, err);

		}

		}

		codec_dai->probed = 0;

		codec_dai->probed = 0;

		list_del(&codec_dai->card_list);

	}

	}

}

}
@@ -1049,7 +1048,6 @@ static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order) 
					cpu_dai->name, err);

					cpu_dai->name, err);

		}

		}

		cpu_dai->probed = 0;

		cpu_dai->probed = 0;

		list_del(&cpu_dai->card_list);





		if (!cpu_dai->codec) {

		if (!cpu_dai->codec) {

			snd_soc_dapm_free(&cpu_dai->dapm);

			snd_soc_dapm_free(&cpu_dai->dapm);
@@ -1405,7 +1403,6 @@ static int soc_probe_codec_dai(struct snd_soc_card *card, 




		/* mark codec_dai as probed and add to card dai list */

		/* mark codec_dai as probed and add to card dai list */

		codec_dai->probed = 1;

		codec_dai->probed = 1;

		list_add(&codec_dai->card_list, &card->dai_dev_list);

	}

	}





	return 0;

	return 0;
@@ -1490,8 +1487,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) 
			}

			}

		}

		}

		cpu_dai->probed = 1;

		cpu_dai->probed = 1;

		/* mark cpu_dai as probed and add to card dai list */

		list_add(&cpu_dai->card_list, &card->dai_dev_list);

	}

	}





	/* probe the CODEC DAI */

	/* probe the CODEC DAI */