Date: | 2013-03-22 14:12:13 (11 years 6 days ago) |
---|---|
Author: | Lars C. |
Commit: | 0b4b338e2a7be677ba82329d7b573b4b097cf070 |
Message: | ASoC: mxs: Embed the mxs_dma_data struct in the mxs_pcm_dma_params
struct Currently the mxs_dma_data struct, which gets passed to the dmaengine driver, is allocated in the pcm driver's open callback. The mxs_dma_data struct has exactly one field which is initialized from the the same field in the mxs_pcm_dma_params struct. The mxs_pcm_dma_params struct gets passed to the pcm driver from the dai driver. Instead of taking this indirection embed the mxs_dma_data struct directly in the mxs_pcm_dma_params struct. This allows us to simplify the pcm driver quite a bit, since we don't have to care about memory managing the mxs_dma_data struct anymore. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
Files: |
sound/soc/mxs/mxs-pcm.c (6 diffs) sound/soc/mxs/mxs-pcm.h (1 diff) sound/soc/mxs/mxs-saif.c (1 diff) |
Change Details
sound/soc/mxs/mxs-pcm.c | ||
---|---|---|
28 | 28 | #include <linux/platform_device.h> |
29 | 29 | #include <linux/slab.h> |
30 | 30 | #include <linux/dmaengine.h> |
31 | #include <linux/fsl/mxs-dma.h> | |
32 | 31 | |
33 | 32 | #include <sound/core.h> |
34 | 33 | #include <sound/initval.h> |
... | ... | |
39 | 38 | |
40 | 39 | #include "mxs-pcm.h" |
41 | 40 | |
42 | struct mxs_pcm_dma_data { | |
43 | struct mxs_dma_data dma_data; | |
44 | struct mxs_pcm_dma_params *dma_params; | |
45 | }; | |
46 | ||
47 | 41 | static struct snd_pcm_hardware snd_mxs_hardware = { |
48 | 42 | .info = SNDRV_PCM_INFO_MMAP | |
49 | 43 | SNDRV_PCM_INFO_MMAP_VALID | |
... | ... | |
66 | 60 | |
67 | 61 | static bool filter(struct dma_chan *chan, void *param) |
68 | 62 | { |
69 | struct mxs_pcm_dma_data *pcm_dma_data = param; | |
70 | struct mxs_pcm_dma_params *dma_params = pcm_dma_data->dma_params; | |
63 | struct mxs_pcm_dma_params *dma_params = param; | |
71 | 64 | |
72 | 65 | if (!mxs_dma_is_apbx(chan)) |
73 | 66 | return false; |
... | ... | |
75 | 68 | if (chan->chan_id != dma_params->chan_num) |
76 | 69 | return false; |
77 | 70 | |
78 | chan->private = &pcm_dma_data->dma_data; | |
71 | chan->private = &dma_params->dma_data; | |
79 | 72 | |
80 | 73 | return true; |
81 | 74 | } |
... | ... | |
91 | 84 | static int snd_mxs_open(struct snd_pcm_substream *substream) |
92 | 85 | { |
93 | 86 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
94 | struct mxs_pcm_dma_data *pcm_dma_data; | |
95 | int ret; | |
96 | ||
97 | pcm_dma_data = kzalloc(sizeof(*pcm_dma_data), GFP_KERNEL); | |
98 | if (pcm_dma_data == NULL) | |
99 | return -ENOMEM; | |
100 | ||
101 | pcm_dma_data->dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); | |
102 | pcm_dma_data->dma_data.chan_irq = pcm_dma_data->dma_params->chan_irq; | |
103 | ||
104 | ret = snd_dmaengine_pcm_open(substream, filter, pcm_dma_data); | |
105 | if (ret) { | |
106 | kfree(pcm_dma_data); | |
107 | return ret; | |
108 | } | |
109 | 87 | |
110 | 88 | snd_soc_set_runtime_hwparams(substream, &snd_mxs_hardware); |
111 | 89 | |
112 | snd_dmaengine_pcm_set_data(substream, pcm_dma_data); | |
113 | ||
114 | return 0; | |
115 | } | |
116 | ||
117 | static int snd_mxs_close(struct snd_pcm_substream *substream) | |
118 | { | |
119 | struct mxs_pcm_dma_data *pcm_dma_data = snd_dmaengine_pcm_get_data(substream); | |
120 | ||
121 | snd_dmaengine_pcm_close(substream); | |
122 | kfree(pcm_dma_data); | |
123 | ||
124 | return 0; | |
90 | return snd_dmaengine_pcm_open(substream, filter, | |
91 | snd_soc_dai_get_dma_data(rtd->cpu_dai, substream)); | |
125 | 92 | } |
126 | 93 | |
127 | 94 | static int snd_mxs_pcm_mmap(struct snd_pcm_substream *substream, |
... | ... | |
137 | 104 | |
138 | 105 | static struct snd_pcm_ops mxs_pcm_ops = { |
139 | 106 | .open = snd_mxs_open, |
140 | .close = snd_mxs_close, | |
107 | .close = snd_dmaengine_pcm_close, | |
141 | 108 | .ioctl = snd_pcm_lib_ioctl, |
142 | 109 | .hw_params = snd_mxs_pcm_hw_params, |
143 | 110 | .trigger = snd_dmaengine_pcm_trigger, |
sound/soc/mxs/mxs-pcm.h | ||
---|---|---|
19 | 19 | #ifndef _MXS_PCM_H |
20 | 20 | #define _MXS_PCM_H |
21 | 21 | |
22 | #include <linux/fsl/mxs-dma.h> | |
23 | ||
22 | 24 | struct mxs_pcm_dma_params { |
23 | int chan_irq; | |
25 | struct mxs_dma_data dma_data; | |
24 | 26 | int chan_num; |
25 | 27 | }; |
26 | 28 |
sound/soc/mxs/mxs-saif.c | ||
---|---|---|
753 | 753 | return ret; |
754 | 754 | } |
755 | 755 | |
756 | saif->dma_param.chan_irq = platform_get_irq(pdev, 1); | |
757 | if (saif->dma_param.chan_irq < 0) { | |
758 | ret = saif->dma_param.chan_irq; | |
756 | saif->dma_param.dma_data.chan_irq = platform_get_irq(pdev, 1); | |
757 | if (saif->dma_param.dma_data.chan_irq < 0) { | |
758 | ret = saif->dma_param.dma_data.chan_irq; | |
759 | 759 | dev_err(&pdev->dev, "failed to get dma irq resource: %d\n", |
760 | 760 | ret); |
761 | 761 | return ret; |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9