aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-02-20 05:28:07 -0500
committerMark Brown <broonie@kernel.org>2015-03-07 10:04:30 -0500
commit56f2906ae2d0b48b64a67feef99e3be3b40c3617 (patch)
tree368d682786ad9456c765e4a23fbe57103f05dbb3 /sound/soc/sh
parent288f392e729dd4d3719c2319c7c3f8d4c820488b (diff)
ASoC: rsnd: remove rsnd_dma::addr
DMAEngine for Renesas R-Car driver is used only for Audio DMAC now. rsnd_dma::addr was added to support Audio DMAC peri peri, but it is no longer needed. Let's remove it Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/rcar/dma.c2
-rw-r--r--sound/soc/sh/rcar/rsnd.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index a01bb8c6b068..c407fd250d2a 100644
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -89,7 +89,6 @@ static void rsnd_dmaen_start(struct rsnd_dma *dma)
89 struct dma_async_tx_descriptor *desc; 89 struct dma_async_tx_descriptor *desc;
90 90
91 desc = dmaengine_prep_dma_cyclic(dma->chan, 91 desc = dmaengine_prep_dma_cyclic(dma->chan,
92 (dma->addr) ? dma->addr :
93 substream->runtime->dma_addr, 92 substream->runtime->dma_addr,
94 snd_pcm_lib_buffer_bytes(substream), 93 snd_pcm_lib_buffer_bytes(substream),
95 snd_pcm_lib_period_bytes(substream), 94 snd_pcm_lib_period_bytes(substream),
@@ -157,7 +156,6 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
157 if (ret < 0) 156 if (ret < 0)
158 goto rsnd_dma_init_err; 157 goto rsnd_dma_init_err;
159 158
160 dma->addr = is_play ? cfg.src_addr : cfg.dst_addr;
161 dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; 159 dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
162 160
163 return 0; 161 return 0;
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 9e67142c82bd..a2954917bfcb 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -183,7 +183,6 @@ struct rsnd_dma {
183 struct dma_chan *chan; 183 struct dma_chan *chan;
184 struct rsnd_dma_ops *ops; 184 struct rsnd_dma_ops *ops;
185 enum dma_transfer_direction dir; 185 enum dma_transfer_direction dir;
186 dma_addr_t addr;
187 int dmapp_id; 186 int dmapp_id;
188 u32 chcr; 187 u32 chcr;
189 dma_addr_t src_addr; 188 dma_addr_t src_addr;