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

ASoC: soc-generic-dmaengine-pcm: convert not to use asoc_xxx() 



ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87cyyop8so.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/soc-generic-dmaengine-pcm.c

+5 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static struct device *dmaengine_dma_dev(struct dmaengine_pcm *pcm, 
int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_dmaengine_dai_dma_data *dma_data;

	int ret;
@@ -60,7 +60,7 @@ int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



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

	dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);



	ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config);

	if (ret)
@@ -98,7 +98,7 @@ static int 
dmaengine_pcm_set_runtime_hwparams(struct snd_soc_component *component,

				   struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct dmaengine_pcm *pcm = soc_component_to_pcm(component);

	struct device *dma_dev = dmaengine_dma_dev(pcm, substream);

	struct dma_chan *chan = pcm->chan[substream->stream];
@@ -115,7 +115,7 @@ dmaengine_pcm_set_runtime_hwparams(struct snd_soc_component *component, 
		return snd_soc_set_runtime_hwparams(substream,

				pcm->config->pcm_hardware);



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

	dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);



	memset(&hw, 0, sizeof(hw));

	hw.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
@@ -185,7 +185,7 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel( 
		return NULL;

	}



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

	dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);



	if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])

		return pcm->chan[0];