leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: samsung: Drop usage of struct s3c_dma_params from ac97.c

Browse Source 
struct s3c_dma_params already includes struct snd_dmaengine_dai_dma_data,
there is no need for such an indirection so switch to using struct
snd_dmaengine_dai_dma_data instead of struct s3c_dma_params.  This also
allows us to use snd_soc_dai_init_dma_data() function instead of the
platform specific samsung_asoc_init_dma_data helper.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Sylwester Nawrocki 2016-08-04 11:30:29 +02:00 committed by Mark Brown
parent ea37bd4df5
commit 996d81e167
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sound/soc/samsung/ac97.c
View File

@ -38,16 +38,16 @@ struct s3c_ac97_info {
}; };
static struct s3c_ac97_info s3c_ac97; static struct s3c_ac97_info s3c_ac97;
static struct s3c_dma_params s3c_ac97_pcm_out = { static struct snd_dmaengine_dai_dma_data s3c_ac97_pcm_out = {
.dma_size = 4, .addr_width = 4,
}; };
static struct s3c_dma_params s3c_ac97_pcm_in = { static struct snd_dmaengine_dai_dma_data s3c_ac97_pcm_in = {
.dma_size = 4, .addr_width = 4,
}; };
static struct s3c_dma_params s3c_ac97_mic_in = { static struct snd_dmaengine_dai_dma_data s3c_ac97_mic_in = {
.dma_size = 4, .addr_width = 4,
}; };
static void s3c_ac97_activate(struct snd_ac97 *ac97) static void s3c_ac97_activate(struct snd_ac97 *ac97)
@ -273,14 +273,14 @@ static const struct snd_soc_dai_ops s3c_ac97_mic_dai_ops = {
static int s3c_ac97_dai_probe(struct snd_soc_dai *dai) static int s3c_ac97_dai_probe(struct snd_soc_dai *dai)
{ {
samsung_asoc_init_dma_data(dai, &s3c_ac97_pcm_out, &s3c_ac97_pcm_in); snd_soc_dai_init_dma_data(dai, &s3c_ac97_pcm_out, &s3c_ac97_pcm_in);
return 0; return 0;
} }
static int s3c_ac97_mic_dai_probe(struct snd_soc_dai *dai) static int s3c_ac97_mic_dai_probe(struct snd_soc_dai *dai)
{ {
samsung_asoc_init_dma_data(dai, NULL, &s3c_ac97_mic_in); snd_soc_dai_init_dma_data(dai, NULL, &s3c_ac97_mic_in);
return 0; return 0;
} }
@ -346,12 +346,12 @@ static int s3c_ac97_probe(struct platform_device *pdev)
if (IS_ERR(s3c_ac97.regs)) if (IS_ERR(s3c_ac97.regs))
return PTR_ERR(s3c_ac97.regs); return PTR_ERR(s3c_ac97.regs);
s3c_ac97_pcm_out.slave = ac97_pdata->dma_playback; s3c_ac97_pcm_out.filter_data = ac97_pdata->dma_playback;
s3c_ac97_pcm_out.dma_addr = mem_res->start + S3C_AC97_PCM_DATA; s3c_ac97_pcm_out.addr = mem_res->start + S3C_AC97_PCM_DATA;
s3c_ac97_pcm_in.slave = ac97_pdata->dma_capture; s3c_ac97_pcm_in.filter_data = ac97_pdata->dma_capture;
s3c_ac97_pcm_in.dma_addr = mem_res->start + S3C_AC97_PCM_DATA; s3c_ac97_pcm_in.addr = mem_res->start + S3C_AC97_PCM_DATA;
s3c_ac97_mic_in.slave = ac97_pdata->dma_capture_mic; s3c_ac97_mic_in.filter_data = ac97_pdata->dma_capture_mic;
s3c_ac97_mic_in.dma_addr = mem_res->start + S3C_AC97_MIC_DATA; s3c_ac97_mic_in.addr = mem_res->start + S3C_AC97_MIC_DATA;
init_completion(&s3c_ac97.done); init_completion(&s3c_ac97.done);
mutex_init(&s3c_ac97.lock); mutex_init(&s3c_ac97.lock);