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

Commit 2a374b78 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Remove platform field from snd_soc_dai 



Typically a DAI does not need direct access to the platform. Currently the
only user of this field is in a platform driver where we have a more direct
way of getting a pointer to the platform. This patch updates the driver to
use the more direct way and then removes the platform 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 dd63a9c2

include/sound/soc-dai.h

+0 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ struct snd_soc_dai { 
	unsigned int sample_bits;



	/* parent platform/codec */

	struct snd_soc_platform *platform;

	struct snd_soc_codec *codec;

	struct snd_soc_component *component;

sound/soc/soc-core.c

+0 −2
Original line number Diff line number Diff line
@@ -1309,7 +1309,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) 
{

	struct snd_soc_dai_link *dai_link = &card->dai_link[num];

	struct snd_soc_pcm_runtime *rtd = &card->rtd[num];

	struct snd_soc_platform *platform = rtd->platform;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int i, ret;
@@ -1317,7 +1316,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) 
			card->name, num, order);



	/* config components */

	cpu_dai->platform = platform;

	cpu_dai->card = card;

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

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

sound/soc/txx9/txx9aclc.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static int txx9aclc_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	struct platform_device *pdev = to_platform_device(dai->platform->dev);

	struct platform_device *pdev = to_platform_device(rtd->platform->dev);

	struct txx9aclc_soc_device *dev;

	struct resource *r;

	int i;