diff options
-rw-r--r-- | sound/soc/mxs/mxs-pcm.c | 5 | ||||
-rw-r--r-- | sound/soc/mxs/mxs-pcm.h | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c index 105f42a394df..06c18ecffbb4 100644 --- a/sound/soc/mxs/mxs-pcm.c +++ b/sound/soc/mxs/mxs-pcm.c | |||
@@ -119,19 +119,14 @@ static int snd_mxs_pcm_hw_params(struct snd_pcm_substream *substream, | |||
119 | return ret; | 119 | return ret; |
120 | chan = iprtd->dma_chan; | 120 | chan = iprtd->dma_chan; |
121 | 121 | ||
122 | iprtd->size = params_buffer_bytes(params); | ||
123 | iprtd->periods = params_periods(params); | 122 | iprtd->periods = params_periods(params); |
124 | iprtd->period_bytes = params_period_bytes(params); | 123 | iprtd->period_bytes = params_period_bytes(params); |
125 | iprtd->offset = 0; | 124 | iprtd->offset = 0; |
126 | iprtd->period_time = HZ / (params_rate(params) / | ||
127 | params_period_size(params)); | ||
128 | 125 | ||
129 | snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); | 126 | snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); |
130 | 127 | ||
131 | dma_addr = runtime->dma_addr; | 128 | dma_addr = runtime->dma_addr; |
132 | 129 | ||
133 | iprtd->buf = substream->dma_buffer.area; | ||
134 | |||
135 | iprtd->desc = chan->device->device_prep_dma_cyclic(chan, dma_addr, | 130 | iprtd->desc = chan->device->device_prep_dma_cyclic(chan, dma_addr, |
136 | iprtd->period_bytes * iprtd->periods, | 131 | iprtd->period_bytes * iprtd->periods, |
137 | iprtd->period_bytes, | 132 | iprtd->period_bytes, |
diff --git a/sound/soc/mxs/mxs-pcm.h b/sound/soc/mxs/mxs-pcm.h index f55ac4f7a76a..ba75e103bb3b 100644 --- a/sound/soc/mxs/mxs-pcm.h +++ b/sound/soc/mxs/mxs-pcm.h | |||
@@ -29,11 +29,7 @@ struct mxs_pcm_dma_params { | |||
29 | struct mxs_pcm_runtime_data { | 29 | struct mxs_pcm_runtime_data { |
30 | int period_bytes; | 30 | int period_bytes; |
31 | int periods; | 31 | int periods; |
32 | int dma; | ||
33 | unsigned long offset; | 32 | unsigned long offset; |
34 | unsigned long size; | ||
35 | void *buf; | ||
36 | int period_time; | ||
37 | struct dma_async_tx_descriptor *desc; | 33 | struct dma_async_tx_descriptor *desc; |
38 | struct dma_chan *dma_chan; | 34 | struct dma_chan *dma_chan; |
39 | struct mxs_dma_data dma_data; | 35 | struct mxs_dma_data dma_data; |