diff --git a/[refs] b/[refs] index 415104b10c3f..f9907ef1d7e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e54e2f81da0aaf9e39d6f9b25fa08ce0bec9ca06 +refs/heads/master: f6914024575fc3fd9773531ca74d1bcb0ddaf88f diff --git a/trunk/sound/soc/imx/imx-pcm-dma-mx2.c b/trunk/sound/soc/imx/imx-pcm-dma-mx2.c index bc1df166385a..ec1394415526 100644 --- a/trunk/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/trunk/sound/soc/imx/imx-pcm-dma-mx2.c @@ -35,11 +35,7 @@ struct imx_pcm_runtime_data { int period_bytes; int periods; - int dma; unsigned long offset; - unsigned long size; - void *buf; - int period_time; struct dma_async_tx_descriptor *desc; struct dma_chan *dma_chan; struct imx_dma_data dma_data; @@ -144,19 +140,14 @@ static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream, return ret; chan = iprtd->dma_chan; - iprtd->size = params_buffer_bytes(params); iprtd->periods = params_periods(params); iprtd->period_bytes = params_period_bytes(params); iprtd->offset = 0; - iprtd->period_time = HZ / (params_rate(params) / - params_period_size(params)); snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); dma_addr = runtime->dma_addr; - iprtd->buf = (unsigned int *)substream->dma_buffer.area; - iprtd->desc = chan->device->device_prep_dma_cyclic(chan, dma_addr, iprtd->period_bytes * iprtd->periods, iprtd->period_bytes,