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

ASoC: atmel: 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/87369zk5ul.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/atmel/atmel-pcm-dma.c

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static void atmel_pcm_dma_irq(u32 ssc_sr, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct atmel_pcm_dma_params *prtd;



	prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);

	prtd = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);



	if (ssc_sr & prtd->mask->ssc_error) {

		if (snd_pcm_running(substream))
@@ -83,7 +83,7 @@ static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream, 
	struct ssc_device *ssc;

	int ret;



	prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);

	prtd = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);

	ssc = prtd->ssc;



	ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config);

sound/soc/atmel/atmel-pcm-pdc.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int atmel_pcm_hw_params(struct snd_soc_component *component, 
	snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);

	runtime->dma_bytes = params_buffer_bytes(params);



	prtd->params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);

	prtd->params = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);

	prtd->params->dma_intr_handler = atmel_pcm_dma_irq;



	prtd->dma_buffer = runtime->dma_addr;

sound/soc/atmel/atmel_wm8904.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static int atmel_asoc_wm8904_hw_params(struct snd_pcm_substream *substream, 
		struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int ret;



	ret = snd_soc_dai_set_pll(codec_dai, WM8904_FLL_MCLK, WM8904_FLL_MCLK,

sound/soc/atmel/mikroe-proto.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
static int snd_proto_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);



	/* Set proto sysclk */

	int ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,

sound/soc/atmel/sam9g20_wm8731.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
 */

static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct device *dev = rtd->dev;

	int ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE