From: Vinod Koul <vinod.koul@intel.com>
To: dan.j.williams@intel.com, linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, g.liakhovetski@gmx.de,
linux@arm.linux.org.uk, Vinod Koul <vinod.koul@intel.com>,
Dave Jiang <dave.jiang@intel.com>
Subject: [PATCH 13/28] dmaengine: ioat: use DMA_COMPLETE for dma completion status
Date: Wed, 16 Oct 2013 21:58:31 +0530 [thread overview]
Message-ID: <1381940926-25564-14-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1381940926-25564-1-git-send-email-vinod.koul@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
CC: Dave Jiang <dave.jiang@intel.com>
---
drivers/dma/ioat/dma.c | 4 ++--
drivers/dma/ioat/dma_v3.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index 5ff6fc1..a0f0fce 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -733,7 +733,7 @@ ioat_dma_tx_status(struct dma_chan *c, dma_cookie_t cookie,
enum dma_status ret;
ret = dma_cookie_status(c, cookie, txstate);
- if (ret == DMA_SUCCESS)
+ if (ret == DMA_COMPLETE)
return ret;
device->cleanup_fn((unsigned long) c);
@@ -859,7 +859,7 @@ int ioat_dma_self_test(struct ioatdma_device *device)
if (tmo == 0 ||
dma->device_tx_status(dma_chan, cookie, NULL)
- != DMA_SUCCESS) {
+ != DMA_COMPLETE) {
dev_err(dev, "Self-test copy timed out, disabling\n");
err = -ENODEV;
goto unmap_dma;
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
index d8ececa..806b4ce 100644
--- a/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@ -807,7 +807,7 @@ ioat3_tx_status(struct dma_chan *c, dma_cookie_t cookie,
enum dma_status ret;
ret = dma_cookie_status(c, cookie, txstate);
- if (ret == DMA_SUCCESS)
+ if (ret == DMA_COMPLETE)
return ret;
ioat3_cleanup(ioat);
@@ -1468,7 +1468,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
- if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {
+ if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
dev_err(dev, "Self-test xor timed out\n");
err = -ENODEV;
goto dma_unmap;
@@ -1530,7 +1530,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
- if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {
+ if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
dev_err(dev, "Self-test validate timed out\n");
err = -ENODEV;
goto dma_unmap;
@@ -1577,7 +1577,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device)
tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
- if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_SUCCESS) {
+ if (dma->device_tx_status(dma_chan, cookie, NULL) != DMA_COMPLETE) {
dev_err(dev, "Self-test 2nd validate timed out\n");
err = -ENODEV;
goto dma_unmap;
--
1.7.0.4
next prev parent reply other threads:[~2013-10-16 17:22 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 16:28 [PATCH 00/28]: dmaengine: " Vinod Koul
2013-10-16 16:28 ` [PATCH 01/28] " Vinod Koul
2013-10-16 18:29 ` Guennadi Liakhovetski
2013-10-16 18:45 ` Dan Williams
2013-10-17 2:07 ` Vinod Koul
2013-10-17 8:27 ` Guennadi Liakhovetski
2013-10-17 9:53 ` Vinod Koul
2013-10-17 14:27 ` Sebastian Andrzej Siewior
2013-10-17 13:48 ` Vinod Koul
2013-10-24 21:28 ` Guennadi Liakhovetski
2013-10-25 4:23 ` Vinod Koul
2013-10-25 6:32 ` Guennadi Liakhovetski
2013-10-25 5:43 ` Vinod Koul
2013-10-25 6:43 ` Guennadi Liakhovetski
2013-10-29 16:47 ` Olof Johansson
2013-10-30 13:03 ` Vinod Koul
2013-11-04 12:51 ` Sebastian Andrzej Siewior
2013-11-11 19:13 ` Olof Johansson
2013-11-12 4:00 ` Vinod Koul
2013-11-12 5:11 ` Olof Johansson
2013-11-12 4:47 ` Vinod Koul
2013-10-17 14:39 ` Guennadi Liakhovetski
2013-10-16 16:28 ` [PATCH 02/28] dmaengine: amba-pl08x: " Vinod Koul
2013-10-16 16:28 ` [PATCH 03/28] dmaengine: at_hdma: " Vinod Koul
2013-10-17 8:08 ` Nicolas Ferre
2013-10-16 16:28 ` [PATCH 04/28] dmaengine: coh901318: " Vinod Koul
2013-10-16 16:28 ` [PATCH 05/28] dmaengine: cppi41: " Vinod Koul
2013-10-16 16:28 ` [PATCH 06/28] dmaengine: jz4740: " Vinod Koul
2013-10-16 16:28 ` [PATCH 07/28] dmaengine: dmatest: " Vinod Koul
2013-10-16 16:28 ` [PATCH 08/28] dmaengine: dw: " Vinod Koul
2013-10-17 13:43 ` Andy Shevchenko
2013-10-21 7:33 ` Viresh Kumar
2013-10-16 16:28 ` [PATCH 09/28] dmaengine: edma: " Vinod Koul
2013-10-17 0:31 ` Joel Fernandes
2013-10-16 16:28 ` [PATCH 10/28] dmaengine: imx-dma: " Vinod Koul
2013-10-16 16:28 ` [PATCH 11/28] dmaengine: imx-sdma: " Vinod Koul
2013-10-16 16:28 ` [PATCH 12/28] dmaengine: intel_mid_dma: " Vinod Koul
2013-10-16 16:28 ` Vinod Koul [this message]
2013-10-16 16:28 ` [PATCH 14/28] dmaengine: iop: " Vinod Koul
2013-10-16 16:28 ` [PATCH 15/28] dmaengine: k3dma: " Vinod Koul
2013-10-17 14:18 ` zhangfei gao
2013-10-16 16:28 ` [PATCH 16/28] dmaengine: mmp_tdma: " Vinod Koul
2013-10-17 14:19 ` zhangfei gao
2013-10-16 16:28 ` [PATCH 17/28] dmaengine: mv_xor: " Vinod Koul
2013-10-16 16:28 ` [PATCH 18/28] dmaengine: mxs-dma: " Vinod Koul
2013-10-16 16:28 ` [PATCH 19/28] dmaengine: omap: " Vinod Koul
2013-10-16 16:28 ` [PATCH 20/28] dmaengine: ppc4xx: " Vinod Koul
2013-10-16 16:28 ` [PATCH 21/28] dmaengine: sa11x0: " Vinod Koul
2013-10-16 16:28 ` [PATCH 22/28] dmaengine: sh: " Vinod Koul
2013-10-16 16:28 ` [PATCH 23/28] dmaengine: ste: " Vinod Koul
2013-10-16 16:28 ` [PATCH 24/28] dmaengine: tegra: " Vinod Koul
2013-10-16 16:28 ` [PATCH 25/28] dmaengine: txx9: " Vinod Koul
2013-10-16 16:28 ` [PATCH 26/28] async_tx: " Vinod Koul
2013-10-16 16:28 ` [PATCH 27/28] serial: sh: " Vinod Koul
2013-10-16 20:17 ` Greg Kroah-Hartman
2013-10-16 16:28 ` [PATCH 28/28] net: " Vinod Koul
2013-10-17 2:16 ` [PATCH 29/29] dmaengine: remove unused DMA_SUCCESS Vinod Koul
2013-10-17 4:55 ` [PATCH 28/28] net: use DMA_COMPLETE for dma completion status David Miller
2013-10-17 9:00 ` [PATCH 00/28]: dmaengine: " Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381940926-25564-14-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=g.liakhovetski@gmx.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®