]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
staging: apf: Remove spurious dmac_{map,unmap}_area calls
authorYogesh Chobe <yogesh.chobe@xilinx.com>
Wed, 2 Dec 2015 21:27:57 +0000 (13:27 -0800)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 4 Dec 2015 08:15:23 +0000 (09:15 +0100)
Signed-off-by: Yogesh Chobe <yogesh.chobe@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/staging/apf/xilinx-dma-apf.c
drivers/staging/apf/xlnk.c

index 6855e39bd642a30ee972e9c409114e8cad13d36c..8d5fa282f9fb292741042369baf6a8ce7802ba88 100644 (file)
@@ -830,7 +830,6 @@ int xdma_submit(struct xdma_chan *chan,
                sgcnt_dma = sgcnt;
                if (user_flags & CF_FLAG_CACHE_FLUSH_INVALIDATE) {
                        kaddr = phys_to_virt((phys_addr_t)userbuf);
-                       dmac_map_area(kaddr, size, DMA_TO_DEVICE);
                        if (dmadir == DMA_TO_DEVICE) {
                                outer_clean_range((phys_addr_t)userbuf,
                                                (u32)userbuf + size);
@@ -930,7 +929,6 @@ int xdma_wait(struct xdma_head *dmahead, unsigned int user_flags)
                                outer_inv_range((phys_addr_t)paddr,
                                                (u32)paddr + size);
                        }
-                       dmac_unmap_area(kaddr, size, DMA_FROM_DEVICE);
                }
        }
        return 0;
index 2adbea52e8f2fec0f8efc07ca8c1cf191172c554..a471afd726203d7e4a3e0c9543c9de069efae9c4 100644 (file)
@@ -1160,14 +1160,12 @@ static int xlnk_cachecontrol_ioctl(struct file *filp, unsigned int code,
 
        if (temp_args.cachecontrol.action == 0) {
                /* flush cache */
-               dmac_map_area(kaddr, size, DMA_TO_DEVICE);
                outer_clean_range((unsigned int)paddr,
                                  (unsigned int)(paddr + size));
        } else {
                /* invalidate cache */
                outer_inv_range((unsigned int)paddr,
                                (unsigned int)(paddr + size));
-               dmac_unmap_area(kaddr, size, DMA_FROM_DEVICE);
        }
 
        return 0;