linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: b32955@freescale.com (Huang Shijie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/10] MXS-MMC : use the new DMA flags
Date: Thu, 19 Jan 2012 14:16:05 +0800	[thread overview]
Message-ID: <1326953767-24155-9-git-send-email-b32955@freescale.com> (raw)
In-Reply-To: <1326953767-24155-1-git-send-email-b32955@freescale.com>

Use the new DMA flags while do not change any logic.

Signed-off-by: Huang Shijie <b32955@freescale.com>
---
 drivers/mmc/host/mxs-mmc.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 1e18970..be8fbbc 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -305,7 +305,7 @@ static irqreturn_t mxs_mmc_irq_handler(int irq, void *dev_id)
 }
 
 static struct dma_async_tx_descriptor *mxs_mmc_prep_dma(
-	struct mxs_mmc_host *host, unsigned int append)
+	struct mxs_mmc_host *host, unsigned long flags)
 {
 	struct dma_async_tx_descriptor *desc;
 	struct mmc_data *data = host->data;
@@ -325,7 +325,7 @@ static struct dma_async_tx_descriptor *mxs_mmc_prep_dma(
 	}
 
 	desc = host->dmach->device->device_prep_slave_sg(host->dmach,
-				sgl, sg_len, host->slave_dirn, append);
+				sgl, sg_len, host->slave_dirn, flags);
 	if (desc) {
 		desc->callback = mxs_mmc_dma_irq_callback;
 		desc->callback_param = host;
@@ -358,7 +358,7 @@ static void mxs_mmc_bc(struct mxs_mmc_host *host)
 	host->ssp_pio_words[2] = cmd1;
 	host->dma_dir = DMA_NONE;
 	host->slave_dirn = DMA_TRANS_NONE;
-	desc = mxs_mmc_prep_dma(host, 0);
+	desc = mxs_mmc_prep_dma(host, MXS_DMA_F_WAIT4END);
 	if (!desc)
 		goto out;
 
@@ -398,7 +398,7 @@ static void mxs_mmc_ac(struct mxs_mmc_host *host)
 	host->ssp_pio_words[2] = cmd1;
 	host->dma_dir = DMA_NONE;
 	host->slave_dirn = DMA_TRANS_NONE;
-	desc = mxs_mmc_prep_dma(host, 0);
+	desc = mxs_mmc_prep_dma(host, MXS_DMA_F_WAIT4END);
 	if (!desc)
 		goto out;
 
@@ -526,7 +526,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
 	host->data = data;
 	host->dma_dir = dma_data_dir;
 	host->slave_dirn = slave_dirn;
-	desc = mxs_mmc_prep_dma(host, 1);
+	desc = mxs_mmc_prep_dma(host, MXS_DMA_F_LASTONE);
 	if (!desc)
 		goto out;
 
-- 
1.7.0.4

  parent reply	other threads:[~2012-01-19  6:16 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-19  6:15 [PATCH 00/10] patch set about the MXS-DMA Huang Shijie
2012-01-19  6:15 ` [PATCH 01/10] MXS-DMA : move the mxs-dma.h to a more common place Huang Shijie
2012-01-19  8:58   ` Wolfram Sang
2012-01-19 11:20     ` Mark Brown
2012-01-19 13:04   ` Shawn Guo
2012-01-19  6:15 ` [PATCH 02/10] MXS-DMA : change the header Huang Shijie
2012-01-19  6:16 ` [PATCH 03/10] MXS-MMC : change the DMA header file Huang Shijie
2012-01-19  6:16 ` [PATCH 04/10] MTD/GPMI " Huang Shijie
2012-01-19  6:16 ` [PATCH 05/10] ASoc " Huang Shijie
2012-01-19  6:16 ` [PATCH 06/10] MXS-DMA : add more flags for MXS-DMA Huang Shijie
2012-01-19  9:02   ` Russell King - ARM Linux
2012-01-19  9:31     ` Huang Shijie
2012-01-19  6:16 ` [PATCH 07/10] MXS-DMA : change the last parameter of mxs_dma_prep_slave_sg() Huang Shijie
2012-01-19  6:16 ` Huang Shijie [this message]
2012-01-19  6:16 ` [PATCH 09/10] MTD/GPMI : add a new field `gpmi_version` Huang Shijie
2012-01-19  6:16 ` [PATCH 10/10] MTD/GPMI : change the code for new DMA interface Huang Shijie
2012-01-19  9:10 ` [PATCH 00/10] patch set about the MXS-DMA Shawn Guo
2012-01-19  9:45   ` Wolfram Sang
2012-01-20  3:29     ` Huang Shijie

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=1326953767-24155-9-git-send-email-b32955@freescale.com \
    --to=b32955@freescale.com \
    --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).