OSDN Git Service

dmaengine: pxa_dma: don't use config direction parameter
authorRobert Jarzmik <rj@valbob.noip.me>
Tue, 11 Aug 2015 20:16:32 +0000 (22:16 +0200)
committerVinod Koul <vinod.koul@intel.com>
Mon, 17 Aug 2015 09:22:09 +0000 (14:52 +0530)
Don't use the direction passed in the configuration, and rely on each
transfer's direction to prepare the transfers. This will enable
future removal of direction parameter from dma_slave_config.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/pxa_dma.c

index ddcbbf5..11290b8 100644 (file)
@@ -906,21 +906,21 @@ static void pxad_get_config(struct pxad_chan *chan,
        enum dma_slave_buswidth width = DMA_SLAVE_BUSWIDTH_UNDEFINED;
 
        *dcmd = 0;
-       if (chan->cfg.direction == DMA_DEV_TO_MEM) {
+       if (dir == DMA_DEV_TO_MEM) {
                maxburst = chan->cfg.src_maxburst;
                width = chan->cfg.src_addr_width;
                dev_addr = chan->cfg.src_addr;
                *dev_src = dev_addr;
                *dcmd |= PXA_DCMD_INCTRGADDR | PXA_DCMD_FLOWSRC;
        }
-       if (chan->cfg.direction == DMA_MEM_TO_DEV) {
+       if (dir == DMA_MEM_TO_DEV) {
                maxburst = chan->cfg.dst_maxburst;
                width = chan->cfg.dst_addr_width;
                dev_addr = chan->cfg.dst_addr;
                *dev_dst = dev_addr;
                *dcmd |= PXA_DCMD_INCSRCADDR | PXA_DCMD_FLOWTRG;
        }
-       if (chan->cfg.direction == DMA_MEM_TO_MEM)
+       if (dir == DMA_MEM_TO_MEM)
                *dcmd |= PXA_DCMD_BURST32 | PXA_DCMD_INCTRGADDR |
                        PXA_DCMD_INCSRCADDR;