Unverified Commit b1bee67c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: stm: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer 



Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87a747ir4b.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/stm/stm32_adfsdm.c

+6 −6
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int stm32_adfsdm_trigger(struct snd_soc_component *component, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct stm32_adfsdm_priv *priv =

		snd_soc_dai_get_drvdata(rtd->cpu_dai);

		snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:
@@ -235,7 +235,7 @@ static int stm32_adfsdm_pcm_open(struct snd_soc_component *component, 
				 struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	int ret;



	ret =  snd_soc_set_runtime_hwparams(substream, &stm32_adfsdm_pcm_hw);
@@ -250,7 +250,7 @@ static int stm32_adfsdm_pcm_close(struct snd_soc_component *component, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct stm32_adfsdm_priv *priv =

		snd_soc_dai_get_drvdata(rtd->cpu_dai);

		snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));



	priv->substream = NULL;
@@ -263,7 +263,7 @@ static snd_pcm_uframes_t stm32_adfsdm_pcm_pointer( 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct stm32_adfsdm_priv *priv =

		snd_soc_dai_get_drvdata(rtd->cpu_dai);

		snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));



	return bytes_to_frames(substream->runtime, priv->pos);

}
@@ -274,7 +274,7 @@ static int stm32_adfsdm_pcm_hw_params(struct snd_soc_component *component, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct stm32_adfsdm_priv *priv =

		snd_soc_dai_get_drvdata(rtd->cpu_dai);

		snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));



	priv->pcm_buff = substream->runtime->dma_area;
@@ -287,7 +287,7 @@ static int stm32_adfsdm_pcm_new(struct snd_soc_component *component, 
{

	struct snd_pcm *pcm = rtd->pcm;

	struct stm32_adfsdm_priv *priv =

		snd_soc_dai_get_drvdata(rtd->cpu_dai);

		snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	unsigned int size = DFSDM_MAX_PERIODS * DFSDM_MAX_PERIOD_SIZE;



	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

sound/soc/stm/stm32_sai_sub.c

+1 −1
Original line number Diff line number Diff line
@@ -1238,7 +1238,7 @@ static int stm32_sai_pcm_process_spdif(struct snd_pcm_substream *substream, 
{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct stm32_sai_sub_data *sai = dev_get_drvdata(cpu_dai->dev);

	int *ptr = (int *)(runtime->dma_area + hwoff +

			   channel * (runtime->dma_bytes / runtime->channels));