lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmaengine: remove dma_async_memcpy_pending() macro

Browse Source 
Just use dma_async_issue_pending() directly.

Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Dan Williams <djbw@fb.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2012-11-08 09:59:54 +00:00
committed by Vinod Koul
parent 06eeb11402
commit b9ee86830f
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/misc/carma/carma-fpga-program.c
View File

@@ -546,7 +546,7 @@ static noinline int fpga_program_dma(struct fpga_dev *priv)
goto out_dma_unmap; goto out_dma_unmap;
} }
dma_async_memcpy_issue_pending(chan); dma_async_issue_pending(chan);
/* Set the total byte count */ /* Set the total byte count */
fpga_set_byte_count(priv->regs, priv->bytes); fpga_set_byte_count(priv->regs, priv->bytes);

2
drivers/misc/carma/carma-fpga.c
View File

@@ -751,7 +751,7 @@ static irqreturn_t data_irq(int irq, void *dev_id)
submitted = true; submitted = true;
/* Start the DMA Engine */ /* Start the DMA Engine */
dma_async_memcpy_issue_pending(priv->chan); dma_async_issue_pending(priv->chan);
out: out:
/* If no DMA was submitted, re-enable interrupts */ /* If no DMA was submitted, re-enable interrupts */

2
include/linux/dmaengine.h
View File

@@ -901,8 +901,6 @@ static inline void dma_async_issue_pending(struct dma_chan *chan)
chan->device->device_issue_pending(chan); chan->device->device_issue_pending(chan);
} }
#define dma_async_memcpy_issue_pending(chan) dma_async_issue_pending(chan)
/** /**
* dma_async_is_tx_complete - poll for transaction completion * dma_async_is_tx_complete - poll for transaction completion
* @chan: DMA channel * @chan: DMA channel

6
net/ipv4/tcp.c
View File

@@ -1406,7 +1406,7 @@ static void tcp_service_net_dma(struct sock *sk, bool wait)
return; return;
last_issued = tp->ucopy.dma_cookie; last_issued = tp->ucopy.dma_cookie;
dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); dma_async_issue_pending(tp->ucopy.dma_chan);
do { do {
if (dma_async_memcpy_complete(tp->ucopy.dma_chan, if (dma_async_memcpy_complete(tp->ucopy.dma_chan,
@@ -1744,7 +1744,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
tcp_service_net_dma(sk, true); tcp_service_net_dma(sk, true);
tcp_cleanup_rbuf(sk, copied); tcp_cleanup_rbuf(sk, copied);
} else } else
dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); dma_async_issue_pending(tp->ucopy.dma_chan);
} }
#endif #endif
if (copied >= target) { if (copied >= target) {
@@ -1837,7 +1837,7 @@ do_prequeue:
break; break;
} }
dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); dma_async_issue_pending(tp->ucopy.dma_chan);
if ((offset + used) == skb->len) if ((offset + used) == skb->len)
copied_early = true; copied_early = true;