diff options
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/ste_dma40.h | 19 | ||||
-rw-r--r-- | drivers/dma/ste_dma40.c | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h index 8358f857a29e..c44886062f8e 100644 --- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h +++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h | |||
@@ -172,25 +172,6 @@ struct stedma40_platform_data { | |||
172 | bool stedma40_filter(struct dma_chan *chan, void *data); | 172 | bool stedma40_filter(struct dma_chan *chan, void *data); |
173 | 173 | ||
174 | /** | 174 | /** |
175 | * stedma40_memcpy_sg() - extension of the dma framework, memcpy to/from | ||
176 | * scattergatter lists. | ||
177 | * | ||
178 | * @chan: dmaengine handle | ||
179 | * @sgl_dst: Destination scatter list | ||
180 | * @sgl_src: Source scatter list | ||
181 | * @sgl_len: The length of each scatterlist. Both lists must be of equal length | ||
182 | * and each element must match the corresponding element in the other scatter | ||
183 | * list. | ||
184 | * @flags: is actually enum dma_ctrl_flags. See dmaengine.h | ||
185 | */ | ||
186 | |||
187 | struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, | ||
188 | struct scatterlist *sgl_dst, | ||
189 | struct scatterlist *sgl_src, | ||
190 | unsigned int sgl_len, | ||
191 | unsigned long flags); | ||
192 | |||
193 | /** | ||
194 | * stedma40_slave_mem() - Transfers a raw data buffer to or from a slave | 175 | * stedma40_slave_mem() - Transfers a raw data buffer to or from a slave |
195 | * (=device) | 176 | * (=device) |
196 | * | 177 | * |
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 8c6abc23db80..0f5d61720ab8 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c | |||
@@ -1733,6 +1733,7 @@ err: | |||
1733 | } | 1733 | } |
1734 | 1734 | ||
1735 | struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, | 1735 | struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, |
1736 | static struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, | ||
1736 | struct scatterlist *sgl_dst, | 1737 | struct scatterlist *sgl_dst, |
1737 | struct scatterlist *sgl_src, | 1738 | struct scatterlist *sgl_src, |
1738 | unsigned int sgl_len, | 1739 | unsigned int sgl_len, |
@@ -1771,7 +1772,6 @@ err: | |||
1771 | spin_unlock_irqrestore(&d40c->lock, flags); | 1772 | spin_unlock_irqrestore(&d40c->lock, flags); |
1772 | return NULL; | 1773 | return NULL; |
1773 | } | 1774 | } |
1774 | EXPORT_SYMBOL(stedma40_memcpy_sg); | ||
1775 | 1775 | ||
1776 | bool stedma40_filter(struct dma_chan *chan, void *data) | 1776 | bool stedma40_filter(struct dma_chan *chan, void *data) |
1777 | { | 1777 | { |