From: b32955@freescale.com (Huang Shijie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] mtd: gpmi-nand: move to dma_transfer_direction
Date: Wed, 14 Dec 2011 10:20:31 +0800 [thread overview]
Message-ID: <4EE807EF.4090109@freescale.com> (raw)
In-Reply-To: <1323791286-29574-5-git-send-email-shawn.guo@linaro.org>
? 2011?12?13? 23:48, Shawn Guo ??:
> This patch fixes usage of dma direction to adopt dma_transfer_direction.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 22 ++++++++++++----------
> 1 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> index de4db76..c4c4d6d 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> @@ -827,7 +827,7 @@ int gpmi_send_command(struct gpmi_nand_data *this)
> pio[1] = pio[2] = 0;
> desc = channel->device->device_prep_slave_sg(channel,
> (struct scatterlist *)pio,
> - ARRAY_SIZE(pio), DMA_NONE, 0);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
> if (!desc) {
> pr_err("step 1 error\n");
> return -1;
> @@ -839,7 +839,7 @@ int gpmi_send_command(struct gpmi_nand_data *this)
> sg_init_one(sgl, this->cmd_buffer, this->command_length);
> dma_map_sg(this->dev, sgl, 1, DMA_TO_DEVICE);
> desc = channel->device->device_prep_slave_sg(channel,
> - sgl, 1, DMA_TO_DEVICE, 1);
> + sgl, 1, DMA_MEM_TO_DEV, 1);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -872,7 +872,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)
> pio[1] = 0;
> desc = channel->device->device_prep_slave_sg(channel,
> (struct scatterlist *)pio,
> - ARRAY_SIZE(pio), DMA_NONE, 0);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
> if (!desc) {
> pr_err("step 1 error\n");
> return -1;
> @@ -881,7 +881,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)
> /* [2] send DMA request */
> prepare_data_dma(this, DMA_TO_DEVICE);
> desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
> - 1, DMA_TO_DEVICE, 1);
> + 1, DMA_MEM_TO_DEV, 1);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -908,7 +908,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)
> pio[1] = 0;
> desc = channel->device->device_prep_slave_sg(channel,
> (struct scatterlist *)pio,
> - ARRAY_SIZE(pio), DMA_NONE, 0);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
> if (!desc) {
> pr_err("step 1 error\n");
> return -1;
> @@ -917,7 +917,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)
> /* [2] : send DMA request */
> prepare_data_dma(this, DMA_FROM_DEVICE);
> desc = channel->device->device_prep_slave_sg(channel, &this->data_sgl,
> - 1, DMA_FROM_DEVICE, 1);
> + 1, DMA_DEV_TO_MEM, 1);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -964,7 +964,7 @@ int gpmi_send_page(struct gpmi_nand_data *this,
>
> desc = channel->device->device_prep_slave_sg(channel,
> (struct scatterlist *)pio,
> - ARRAY_SIZE(pio), DMA_NONE, 0);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -998,7 +998,8 @@ int gpmi_read_page(struct gpmi_nand_data *this,
> | BF_GPMI_CTRL0_XFER_COUNT(0);
> pio[1] = 0;
> desc = channel->device->device_prep_slave_sg(channel,
> - (struct scatterlist *)pio, 2, DMA_NONE, 0);
> + (struct scatterlist *)pio, 2,
> + DMA_TRANS_NONE, 0);
> if (!desc) {
> pr_err("step 1 error\n");
> return -1;
> @@ -1027,7 +1028,7 @@ int gpmi_read_page(struct gpmi_nand_data *this,
> pio[5] = auxiliary;
> desc = channel->device->device_prep_slave_sg(channel,
> (struct scatterlist *)pio,
> - ARRAY_SIZE(pio), DMA_NONE, 1);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE, 1);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -1045,7 +1046,8 @@ int gpmi_read_page(struct gpmi_nand_data *this,
> | BF_GPMI_CTRL0_XFER_COUNT(geo->page_size);
> pio[1] = 0;
> desc = channel->device->device_prep_slave_sg(channel,
> - (struct scatterlist *)pio, 2, DMA_NONE, 1);
> + (struct scatterlist *)pio, 2,
> + DMA_TRANS_NONE, 1);
> if (!desc) {
> pr_err("step 3 error\n");
> return -1;
It's ok to me.
next prev parent reply other threads:[~2011-12-14 2:20 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 ` [PATCH 1/4] dmaengine: add DMA_TRANS_NONE to dma_transfer_direction Shawn Guo
2011-12-13 15:48 ` [PATCH 2/4] mmc: mxs-mmc: fix the dma_transfer_direction migration 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 [this message]
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=4EE807EF.4090109@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).