From: Marek Vasut <marek.vasut@gmail.com>
To: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: vinod.koul@intel.com, dan.j.williams@intel.com,
linux-kernel@vger.kernel.org,
David Woodhouse <dwmw2@infradead.org>,
Shawn Guo <shawn.guo@linaro.org>,
Huang Shijie <b32955@freescale.com>,
Artem Bityutskiy <artem.bityutskiy@intel.com>
Subject: Re: [PATCH 06/11] nand/gpmi: add context parameter to prep_slave_sg calls
Date: Thu, 2 Feb 2012 23:13:32 +0100 [thread overview]
Message-ID: <201202022313.33164.marek.vasut@gmail.com> (raw)
In-Reply-To: <1328218341-31436-7-git-send-email-alexandre.bounine@idt.com>
> Fixups for calls affected by adding the new context parameter to DMA_SLAVE
> and DMA_CYCLIC interfaces.
Thanks!
>
> Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Huang Shijie <b32955@freescale.com>
> Cc: Artem Bityutskiy <artem.bityutskiy@intel.com>
> ---
> drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 25 +++++++++++++++----------
> 1 files changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c index 7f68042..c52964e 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> @@ -827,7 +827,8 @@ 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_TRANS_NONE, 0);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE,
> + 0, NULL);
> if (!desc) {
> pr_err("step 1 error\n");
> return -1;
> @@ -839,7 +840,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_MEM_TO_DEV, 1);
> + sgl, 1, DMA_MEM_TO_DEV, 1, NULL);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -872,7 +873,8 @@ 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_TRANS_NONE, 0);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE,
> + 0, NULL);
> if (!desc) {
> pr_err("step 1 error\n");
> return -1;
> @@ -881,7 +883,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_MEM_TO_DEV, 1);
> + 1, DMA_MEM_TO_DEV, 1, NULL);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -908,7 +910,8 @@ 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_TRANS_NONE, 0);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE,
> + 0, NULL);
> if (!desc) {
> pr_err("step 1 error\n");
> return -1;
> @@ -917,7 +920,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_DEV_TO_MEM, 1);
> + 1, DMA_DEV_TO_MEM, 1, NULL);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -964,7 +967,8 @@ int gpmi_send_page(struct gpmi_nand_data *this,
>
> desc = channel->device->device_prep_slave_sg(channel,
> (struct scatterlist *)pio,
> - ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE,
> + 0, NULL);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -999,7 +1003,7 @@ int gpmi_read_page(struct gpmi_nand_data *this,
> pio[1] = 0;
> desc = channel->device->device_prep_slave_sg(channel,
> (struct scatterlist *)pio, 2,
> - DMA_TRANS_NONE, 0);
> + DMA_TRANS_NONE, 0, NULL);
> if (!desc) {
> pr_err("step 1 error\n");
> return -1;
> @@ -1028,7 +1032,8 @@ 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_TRANS_NONE, 1);
> + ARRAY_SIZE(pio), DMA_TRANS_NONE,
> + 1, NULL);
> if (!desc) {
> pr_err("step 2 error\n");
> return -1;
> @@ -1047,7 +1052,7 @@ int gpmi_read_page(struct gpmi_nand_data *this,
> pio[1] = 0;
> desc = channel->device->device_prep_slave_sg(channel,
> (struct scatterlist *)pio, 2,
> - DMA_TRANS_NONE, 1);
> + DMA_TRANS_NONE, 1, NULL);
> if (!desc) {
> pr_err("step 3 error\n");
> return -1;
next prev parent reply other threads:[~2012-02-02 22:13 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-02 21:32 [PATCH 00/11] dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic Alexandre Bounine
2012-02-02 21:32 ` [PATCH 01/11] " Alexandre Bounine
2012-02-02 21:43 ` Russell King
2012-02-03 15:31 ` [PATCH 01/11] dmaengine: add context parameter toprep_slave_sg " Bounine, Alexandre
2012-02-06 11:53 ` Vinod Koul
2012-02-06 15:04 ` Bounine, Alexandre
2012-02-06 15:28 ` Vinod Koul
2012-02-06 15:53 ` Russell King
2012-02-06 17:02 ` [PATCH 01/11] dmaengine: add context parameter toprep_slave_sgand prep_dma_cyclic Bounine, Alexandre
2012-02-06 18:07 ` Vinod Koul
2012-02-06 18:45 ` Bounine, Alexandre
2012-02-07 3:39 ` Vinod Koul
2012-02-07 14:01 ` Bounine, Alexandre
2012-02-07 14:14 ` Vinod Koul
2012-02-07 14:19 ` Bounine, Alexandre
2012-02-06 18:04 ` [PATCH 01/11] dmaengine: add context parameter toprep_slave_sg and prep_dma_cyclic Vinod Koul
2012-02-06 15:56 ` Bounine, Alexandre
2012-02-06 16:16 ` Russell King
2012-02-02 21:32 ` [PATCH 02/11] dmaengine/drivers: add context parameter for DMA_SLAVE and DMA_CYCLIC Alexandre Bounine
2012-02-02 21:32 ` [PATCH 03/11] plat-samsung: " Alexandre Bounine
2012-02-02 21:32 ` [PATCH 04/11] media/video: add new context parameter for DMA_SLAVE calls Alexandre Bounine
2012-02-02 21:32 ` [PATCH 05/11] mmc/host: add context parameter for DMA_SLAVE and DMA_CYCLIC Alexandre Bounine
2012-02-03 9:20 ` Ulf Hansson
2012-02-03 16:52 ` Bounine, Alexandre
2012-02-03 17:01 ` Russell King
2012-02-03 18:36 ` [PATCH 05/11] mmc/host: add context parameter for DMA_SLAVEand DMA_CYCLIC Bounine, Alexandre
2012-02-02 21:32 ` [PATCH 06/11] nand/gpmi: add context parameter to prep_slave_sg calls Alexandre Bounine
2012-02-02 22:13 ` Marek Vasut [this message]
2012-02-03 16:35 ` Bounine, Alexandre
2012-02-02 21:32 ` [PATCH 07/11] net/ks8842: add context parameter to prep_slave_sg call Alexandre Bounine
2012-02-02 21:32 ` [PATCH 08/11] spi/serial: add context parameter for DMA_SLAVE and DMA_CYCLIC Alexandre Bounine
2012-02-02 21:32 ` [PATCH 09/11] usb/musb: add context parameter to prep_slave_sg call Alexandre Bounine
2012-02-02 21:32 ` [PATCH 10/11] usb/renesas: " Alexandre Bounine
2012-02-02 21:32 ` [PATCH 11/11] sound/soc: add context parameter to prep_slave_sg and prep_dma_cyclic calls Alexandre Bounine
2012-02-02 22:22 ` Mark Brown
2012-02-03 16:41 ` Bounine, Alexandre
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=201202022313.33164.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=alexandre.bounine@idt.com \
--cc=artem.bityutskiy@intel.com \
--cc=b32955@freescale.com \
--cc=dan.j.williams@intel.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shawn.guo@linaro.org \
--cc=vinod.koul@intel.com \
/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).