From: Alexandre Bounine <alexandre.bounine@idt.com>
To: vinod.koul@intel.com, dan.j.williams@intel.com,
linux-kernel@vger.kernel.org
Cc: Alexandre Bounine <alexandre.bounine@idt.com>,
"David S. Miller" <davem@davemloft.net>,
Samuel Ortiz <sameo@linux.intel.com>,
Dennis Aberilla <denzzzhome@yahoo.com>,
Alexey Dobriyan <adobriyan@gmail.com>,
Wan ZongShun <mcuos.com@gmail.com>
Subject: [PATCH 07/11] net/ks8842: add context parameter to prep_slave_sg call
Date: Thu, 2 Feb 2012 16:32:17 -0500 [thread overview]
Message-ID: <1328218341-31436-8-git-send-email-alexandre.bounine@idt.com> (raw)
In-Reply-To: <1328218341-31436-1-git-send-email-alexandre.bounine@idt.com>
Fixups for calls affected by adding the new context parameter to DMA_SLAVE
and DMA_CYCLIC interfaces.
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Dennis Aberilla <denzzzhome@yahoo.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Wan ZongShun <mcuos.com@gmail.com>
---
drivers/net/ethernet/micrel/ks8842.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 0a85690..afc6b57 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -460,7 +460,7 @@ static int ks8842_tx_frame_dma(struct sk_buff *skb, struct net_device *netdev)
ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
&ctl->sg, 1, DMA_MEM_TO_DEV,
- DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+ DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP, NULL);
if (!ctl->adesc)
return NETDEV_TX_BUSY;
@@ -572,7 +572,7 @@ static int __ks8842_start_new_rx_dma(struct net_device *netdev)
ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
sg, 1, DMA_DEV_TO_MEM,
- DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+ DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP, NULL);
if (!ctl->adesc)
goto out;
--
1.7.8.4
next prev parent reply other threads:[~2012-02-02 21:36 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
2012-02-03 16:35 ` Bounine, Alexandre
2012-02-02 21:32 ` Alexandre Bounine [this message]
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=1328218341-31436-8-git-send-email-alexandre.bounine@idt.com \
--to=alexandre.bounine@idt.com \
--cc=adobriyan@gmail.com \
--cc=dan.j.williams@intel.com \
--cc=davem@davemloft.net \
--cc=denzzzhome@yahoo.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mcuos.com@gmail.com \
--cc=sameo@linux.intel.com \
--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).