From: Bartlomiej Zolnierkiewicz <b.zolnier...@samsung.com>
Subject: [PATCH 1/2] DMA: remove dma_async_memcpy_pending() macro
Just use dma_async_issue_pending() directly.
Cc: Vinod Koul <vinod.k...@intel.com>
Cc: Dan Williams <d...@fb.com>
Cc: Tomasz Figa <t.f...@samsung.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnier...@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.p...@samsung.com>
---
drivers/misc/carma/carma-fpga-program.c | 2 +-
drivers/misc/carma/carma-fpga.c | 2 +-
include/linux/dmaengine.h | 2 --
net/ipv4/tcp.c | 6 +++---
4 files changed, 5 insertions(+), 7 deletions(-)
Index: b/drivers/misc/carma/carma-fpga-program.c
===================================================================
--- a/drivers/misc/carma/carma-fpga-program.c 2012-11-07 16:00:59.680876184
+0100
+++ b/drivers/misc/carma/carma-fpga-program.c 2012-11-07 16:01:05.612876185
+0100
@@ -546,7 +546,7 @@ static noinline int fpga_program_dma(str
goto out_dma_unmap;
}
- dma_async_memcpy_issue_pending(chan);
+ dma_async_issue_pending(chan);
/* Set the total byte count */
fpga_set_byte_count(priv->regs, priv->bytes);
Index: b/drivers/misc/carma/carma-fpga.c
===================================================================
--- a/drivers/misc/carma/carma-fpga.c 2012-11-07 16:01:17.304876183 +0100
+++ b/drivers/misc/carma/carma-fpga.c 2012-11-07 16:01:23.568876183 +0100
@@ -749,7 +749,7 @@ static irqreturn_t data_irq(int irq, voi
submitted = true;
/* Start the DMA Engine */
- dma_async_memcpy_issue_pending(priv->chan);
+ dma_async_issue_pending(priv->chan);
out:
/* If no DMA was submitted, re-enable interrupts */
Index: b/include/linux/dmaengine.h
===================================================================
--- a/include/linux/dmaengine.h 2012-11-07 16:01:31.720876180 +0100
+++ b/include/linux/dmaengine.h 2012-11-07 16:01:45.072876180 +0100
@@ -902,8 +902,6 @@ static inline void dma_async_issue_pendi
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
* @chan: DMA channel
Index: b/net/ipv4/tcp.c
===================================================================
--- a/net/ipv4/tcp.c 2012-11-07 16:01:52.496876179 +0100
+++ b/net/ipv4/tcp.c 2012-11-07 16:02:13.924876175 +0100
@@ -1410,7 +1410,7 @@ static void tcp_service_net_dma(struct s
return;
last_issued = tp->ucopy.dma_cookie;
- dma_async_memcpy_issue_pending(tp->ucopy.dma_chan);
+ dma_async_issue_pending(tp->ucopy.dma_chan);
do {
if (dma_async_memcpy_complete(tp->ucopy.dma_chan,
@@ -1744,7 +1744,7 @@ int tcp_recvmsg(struct kiocb *iocb, stru
tcp_service_net_dma(sk, true);
tcp_cleanup_rbuf(sk, copied);
} else
-
dma_async_memcpy_issue_pending(tp->ucopy.dma_chan);
+ dma_async_issue_pending(tp->ucopy.dma_chan);
}
#endif
if (copied >= target) {
@@ -1837,7 +1837,7 @@ do_prequeue:
break;
}
-
dma_async_memcpy_issue_pending(tp->ucopy.dma_chan);
+ dma_async_issue_pending(tp->ucopy.dma_chan);
if ((offset + used) == skb->len)
copied_early = true;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
