Messages in this thread Patch in this message | | | Date | Sat, 28 Jun 2008 14:29:10 +0200 | From | Haavard Skinnemoen <> | Subject | Re: [PATCH v4 3/6] dmaengine: Add slave DMA interface |
| |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> wrote: > + * @dma_dev: required DMA master device. If non-NULL, the client can not be > + * bound to other masters than this. The master driver may use > + * this to determine whether it's safe to access
> + struct dma_async_tx_descriptor *(*device_prep_slave_sg)( > + struct dma_chan *chan, struct scatterlist *sgl,
Turns out I forgot to run checkpatch before posting. Here's a small fixup. I'll fold it into this patch if I end up doing a v5 of this series.
The unfinished comment above was redundant anyway, so I just removed the last part.
include/linux/dmaengine.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 8ce03e8..3d57439 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -131,8 +131,7 @@ typedef struct { DECLARE_BITMAP(bits, DMA_TX_TYPE_END); } dma_cap_mask_t; * struct dma_slave - Information about a DMA slave * @dev: device acting as DMA slave * @dma_dev: required DMA master device. If non-NULL, the client can not be - * bound to other masters than this. The master driver may use - * this to determine whether it's safe to access + * bound to other masters than this. * @tx_reg: physical address of data register used for * memory-to-peripheral transfers * @rx_reg: physical address of data register used for @@ -361,7 +360,7 @@ struct dma_device { struct dma_chan *chan, unsigned long flags); struct dma_async_tx_descriptor *(*device_prep_slave_sg)( - struct dma_chan *chan, struct scatterlist *sgl, + struct dma_chan *chan, struct scatterlist *sgl, unsigned int sg_len, enum dma_data_direction direction, unsigned long flags); void (*device_terminate_all)(struct dma_chan *chan); -- 1.5.5.4
| |