Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757580Ab2BBWNh (ORCPT ); Thu, 2 Feb 2012 17:13:37 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:43853 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756390Ab2BBWNg (ORCPT ); Thu, 2 Feb 2012 17:13:36 -0500 From: Marek Vasut To: Alexandre Bounine Subject: Re: [PATCH 06/11] nand/gpmi: add context parameter to prep_slave_sg calls Date: Thu, 2 Feb 2012 23:13:32 +0100 User-Agent: KMail/1.13.7 (Linux/3.2.0-1-amd64; KDE/4.7.4; x86_64; ; ) Cc: vinod.koul@intel.com, dan.j.williams@intel.com, linux-kernel@vger.kernel.org, David Woodhouse , Shawn Guo , Huang Shijie , Artem Bityutskiy References: <1328218341-31436-1-git-send-email-alexandre.bounine@idt.com> <1328218341-31436-7-git-send-email-alexandre.bounine@idt.com> In-Reply-To: <1328218341-31436-7-git-send-email-alexandre.bounine@idt.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <201202022313.33164.marek.vasut@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4451 Lines: 119 > Fixups for calls affected by adding the new context parameter to DMA_SLAVE > and DMA_CYCLIC interfaces. Thanks! > > Signed-off-by: Alexandre Bounine > Cc: David Woodhouse > Cc: Marek Vasut > Cc: Shawn Guo > Cc: Huang Shijie > Cc: Artem Bityutskiy > --- > 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/