tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87cyyop8so.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Kuninori Morimoto
and committed by
Mark Brown
c067b1f8
c35691ff
+5
-5
+5
-5
sound/soc/soc-generic-dmaengine-pcm.c
+5
-5
sound/soc/soc-generic-dmaengine-pcm.c
···
50
50
int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream,
51
51
struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config)
52
52
{
53
-
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
53
+
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
54
54
struct snd_dmaengine_dai_dma_data *dma_data;
55
55
int ret;
56
56
···
60
60
return -EINVAL;
61
61
}
62
62
63
-
dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
63
+
dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);
64
64
65
65
ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config);
66
66
if (ret)
···
98
98
dmaengine_pcm_set_runtime_hwparams(struct snd_soc_component *component,
99
99
struct snd_pcm_substream *substream)
100
100
{
101
-
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
101
+
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
102
102
struct dmaengine_pcm *pcm = soc_component_to_pcm(component);
103
103
struct device *dma_dev = dmaengine_dma_dev(pcm, substream);
104
104
struct dma_chan *chan = pcm->chan[substream->stream];
···
115
115
return snd_soc_set_runtime_hwparams(substream,
116
116
pcm->config->pcm_hardware);
117
117
118
-
dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
118
+
dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);
119
119
120
120
memset(&hw, 0, sizeof(hw));
121
121
hw.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
···
185
185
return NULL;
186
186
}
187
187
188
-
dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
188
+
dma_data = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);
189
189
190
190
if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
191
191
return pcm->chan[0];