From 1da05e91ce00284e9d88ea1252a664be43eff715 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Date: Thu, 8 Nov 2012 09:59:54 +0000
Subject: [PATCH] --- yaml --- r: 358493 b: refs/heads/master c:
 b9ee86830f34737a08deead93872a79a37419a13 h: refs/heads/master i:   358491:
 e8836f04946036cfa5cf6718b4e72e4749fc4b5e v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/misc/carma/carma-fpga-program.c | 2 +-
 trunk/drivers/misc/carma/carma-fpga.c         | 2 +-
 trunk/include/linux/dmaengine.h               | 2 --
 trunk/net/ipv4/tcp.c                          | 6 +++---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7fc2a770a1f5..dc076aeb9399 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06eeb114026804a9a9cb83eaeb00e24aaa40ba0b
+refs/heads/master: b9ee86830f34737a08deead93872a79a37419a13
diff --git a/trunk/drivers/misc/carma/carma-fpga-program.c b/trunk/drivers/misc/carma/carma-fpga-program.c
index eaddfe9db149..736c7714f565 100644
--- a/trunk/drivers/misc/carma/carma-fpga-program.c
+++ b/trunk/drivers/misc/carma/carma-fpga-program.c
@@ -546,7 +546,7 @@ static noinline int fpga_program_dma(struct fpga_dev *priv)
 		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);
diff --git a/trunk/drivers/misc/carma/carma-fpga.c b/trunk/drivers/misc/carma/carma-fpga.c
index 6b43f8c7b3be..7508cafff103 100644
--- a/trunk/drivers/misc/carma/carma-fpga.c
+++ b/trunk/drivers/misc/carma/carma-fpga.c
@@ -751,7 +751,7 @@ static irqreturn_t data_irq(int irq, void *dev_id)
 	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 */
diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h
index be6e95395b11..cd15958d4d1d 100644
--- a/trunk/include/linux/dmaengine.h
+++ b/trunk/include/linux/dmaengine.h
@@ -901,8 +901,6 @@ static inline void dma_async_issue_pending(struct dma_chan *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
  * @chan: DMA channel
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 1ca253635f7a..cf949a119a54 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -1406,7 +1406,7 @@ static void tcp_service_net_dma(struct sock *sk, bool wait)
 		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, struct sock *sk, struct msghdr *msg,
 				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 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 					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;