OSDN Git Service

ASoC: rsnd: remove rsnd_dma::dir
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 20 Feb 2015 10:28:32 +0000 (10:28 +0000)
committerMark Brown <broonie@kernel.org>
Sat, 7 Mar 2015 15:04:30 +0000 (15:04 +0000)
DMAEngine direction can be calculated from rsnd_dai_stream,
So, rsnd_dma::dir does not make sense now.
Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/rcar/dma.c
sound/soc/sh/rcar/rsnd.h

index c407fd2..3f1ea58 100644 (file)
@@ -87,12 +87,13 @@ static void rsnd_dmaen_start(struct rsnd_dma *dma)
        struct snd_pcm_substream *substream = io->substream;
        struct device *dev = rsnd_priv_to_dev(priv);
        struct dma_async_tx_descriptor *desc;
+       int is_play = rsnd_io_is_play(io);
 
        desc = dmaengine_prep_dma_cyclic(dma->chan,
                                         substream->runtime->dma_addr,
                                         snd_pcm_lib_buffer_bytes(substream),
                                         snd_pcm_lib_period_bytes(substream),
-                                        dma->dir,
+                                        is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 
        if (!desc) {
@@ -156,8 +157,6 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
        if (ret < 0)
                goto rsnd_dma_init_err;
 
-       dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
-
        return 0;
 
 rsnd_dma_init_err:
index a295491..5d65a4b 100644 (file)
@@ -182,7 +182,6 @@ struct rsnd_dma_ops {
 struct rsnd_dma {
        struct dma_chan         *chan;
        struct rsnd_dma_ops     *ops;
-       enum dma_transfer_direction dir;
        int                     dmapp_id;
        u32                     chcr;
        dma_addr_t              src_addr;