Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9ee8683 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Vinod Koul
Browse files

dmaengine: remove dma_async_memcpy_pending() macro 



Just use dma_async_issue_pending() directly.

Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarDan Williams <djbw@fb.com>
parent 06eeb114

drivers/misc/carma/carma-fpga-program.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/misc/carma/carma-fpga.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

include/linux/dmaengine.h

+0 −2
Original line number Diff line number Diff line
@@ -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

net/ipv4/tcp.c

+3 −3
Original line number Diff line number Diff line
@@ -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;