linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/4] dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
Date: Tue, 13 Dec 2011 23:48:03 +0800	[thread overview]
Message-ID: <1323791286-29574-2-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1323791286-29574-1-git-send-email-shawn.guo@linaro.org>

Before dma_transfer_direction was introduced to replace
dma_data_direction, some dmaengine device uses DMA_NONE of
dma_data_direction for some talk with its client drivers.
The mxs-dma and its clients mxs-mmc and gpmi-nand are such case.

This patch adds DMA_TRANS_NONE to dma_transfer_direction and
migrate the DMA_NONE use in mxs-dma to it.

It also fixes the compile warning below.

CC      drivers/dma/mxs-dma.o
drivers/dma/mxs-dma.c: In function ?mxs_dma_prep_slave_sg?:
drivers/dma/mxs-dma.c:420:16: warning: comparison between ?enum dma_transfer_direction? and ?enum dma_data_direction?

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 drivers/dma/mxs-dma.c     |    2 +-
 include/linux/dmaengine.h |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index bdf4672..ff89211 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -417,7 +417,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
 		idx = 0;
 	}
 
-	if (direction == DMA_NONE) {
+	if (direction == DMA_TRANS_NONE) {
 		ccw = &mxs_chan->ccw[idx++];
 		pio = (u32 *) sgl;
 
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 5532bb8..679b349 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -88,6 +88,7 @@ enum dma_transfer_direction {
 	DMA_MEM_TO_DEV,
 	DMA_DEV_TO_MEM,
 	DMA_DEV_TO_DEV,
+	DMA_TRANS_NONE,
 };
 
 /**
-- 
1.7.4.1

  reply	other threads:[~2011-12-13 15:48 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-13 15:48 [PATCH 0/4] Fix the left DMA_NONE from dma_transfer_direction migration Shawn Guo
2011-12-13 15:48 ` Shawn Guo [this message]
2011-12-13 15:48 ` [PATCH 2/4] mmc: mxs-mmc: fix the " Shawn Guo
2011-12-13 15:48 ` [PATCH 3/4] mtd: fix compile error for gpmi-nand Shawn Guo
2011-12-14  2:21   ` Huang Shijie
2011-12-13 15:48 ` [PATCH 4/4] mtd: gpmi-nand: move to dma_transfer_direction Shawn Guo
2011-12-14  2:20   ` Huang Shijie
2011-12-14  7:47 ` [PATCH 5/5] ASoC: mxs: correct 'direction' of device_prep_dma_cyclic Shawn Guo
2011-12-14  8:49   ` Dong Aisheng-B29396
2011-12-20  0:51   ` Mark Brown
2011-12-20  3:07     ` [alsa-devel] " Shawn Guo
2011-12-23 16:07   ` Vinod Koul
2011-12-23 16:28     ` Mark Brown
2011-12-23 16:32       ` Vinod Koul
2011-12-20  9:24 ` [PATCH 0/4] Fix the left DMA_NONE from dma_transfer_direction migration Vinod Koul
2011-12-20 12:54   ` Shawn Guo
2011-12-21  4:07     ` Vinod Koul
2011-12-21  4:45       ` Shawn Guo
2011-12-21  4:40         ` Vinod Koul
2011-12-21  4:58           ` Shawn Guo
2011-12-22  5:13             ` Vinod Koul
2011-12-23 16:03 ` Vinod Koul

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=1323791286-29574-2-git-send-email-shawn.guo@linaro.org \
    --to=shawn.guo@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).