Messages in this thread Patch in this message |  | | | From | Alexandre Bounine <> | | Subject | [PATCH 07/11] net/ks8842: add context parameter to prep_slave_sg call | | Date | Thu, 2 Feb 2012 16:32:17 -0500 |
| |
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
|  |