diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2013-07-03 18:05:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:42 -0400 |
commit | 48a9db462d99494583dad829969616ac90a8df4e (patch) | |
tree | d908a6172274a9d4d5c14752aa648086bc4721cd /include | |
parent | dcf6d294830d46b0e6901477fb4bf455281d90c8 (diff) |
drivers/dma: remove unused support for MEMSET operations
There have never been any real users of MEMSET operations since they
have been introduced in January 2007 by commit 7405f74badf4 ("dmaengine:
refactor dmaengine around dma_async_tx_descriptor"). Therefore remove
support for them for now, it can be always brought back when needed.
[sebastian.hesselbarth@gmail.com: fix drivers/dma/mv_xor]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Acked-by: Dan Williams <djbw@fb.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Olof Johansson <olof@lixom.net>
Cc: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/async_tx.h | 4 | ||||
-rw-r--r-- | include/linux/dmaengine.h | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/async_tx.h b/include/linux/async_tx.h index a1c486a88e88..179b38ffd351 100644 --- a/include/linux/async_tx.h +++ b/include/linux/async_tx.h | |||
@@ -182,10 +182,6 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, | |||
182 | unsigned int src_offset, size_t len, | 182 | unsigned int src_offset, size_t len, |
183 | struct async_submit_ctl *submit); | 183 | struct async_submit_ctl *submit); |
184 | 184 | ||
185 | struct dma_async_tx_descriptor * | ||
186 | async_memset(struct page *dest, int val, unsigned int offset, | ||
187 | size_t len, struct async_submit_ctl *submit); | ||
188 | |||
189 | struct dma_async_tx_descriptor *async_trigger_callback(struct async_submit_ctl *submit); | 185 | struct dma_async_tx_descriptor *async_trigger_callback(struct async_submit_ctl *submit); |
190 | 186 | ||
191 | struct dma_async_tx_descriptor * | 187 | struct dma_async_tx_descriptor * |
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 96d3e4ab11a9..cb286b1acdb6 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -66,7 +66,6 @@ enum dma_transaction_type { | |||
66 | DMA_PQ, | 66 | DMA_PQ, |
67 | DMA_XOR_VAL, | 67 | DMA_XOR_VAL, |
68 | DMA_PQ_VAL, | 68 | DMA_PQ_VAL, |
69 | DMA_MEMSET, | ||
70 | DMA_INTERRUPT, | 69 | DMA_INTERRUPT, |
71 | DMA_SG, | 70 | DMA_SG, |
72 | DMA_PRIVATE, | 71 | DMA_PRIVATE, |
@@ -520,7 +519,6 @@ struct dma_tx_state { | |||
520 | * @device_prep_dma_xor_val: prepares a xor validation operation | 519 | * @device_prep_dma_xor_val: prepares a xor validation operation |
521 | * @device_prep_dma_pq: prepares a pq operation | 520 | * @device_prep_dma_pq: prepares a pq operation |
522 | * @device_prep_dma_pq_val: prepares a pqzero_sum operation | 521 | * @device_prep_dma_pq_val: prepares a pqzero_sum operation |
523 | * @device_prep_dma_memset: prepares a memset operation | ||
524 | * @device_prep_dma_interrupt: prepares an end of chain interrupt operation | 522 | * @device_prep_dma_interrupt: prepares an end of chain interrupt operation |
525 | * @device_prep_slave_sg: prepares a slave dma operation | 523 | * @device_prep_slave_sg: prepares a slave dma operation |
526 | * @device_prep_dma_cyclic: prepare a cyclic dma operation suitable for audio. | 524 | * @device_prep_dma_cyclic: prepare a cyclic dma operation suitable for audio. |
@@ -573,9 +571,6 @@ struct dma_device { | |||
573 | struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src, | 571 | struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src, |
574 | unsigned int src_cnt, const unsigned char *scf, size_t len, | 572 | unsigned int src_cnt, const unsigned char *scf, size_t len, |
575 | enum sum_check_flags *pqres, unsigned long flags); | 573 | enum sum_check_flags *pqres, unsigned long flags); |
576 | struct dma_async_tx_descriptor *(*device_prep_dma_memset)( | ||
577 | struct dma_chan *chan, dma_addr_t dest, int value, size_t len, | ||
578 | unsigned long flags); | ||
579 | struct dma_async_tx_descriptor *(*device_prep_dma_interrupt)( | 574 | struct dma_async_tx_descriptor *(*device_prep_dma_interrupt)( |
580 | struct dma_chan *chan, unsigned long flags); | 575 | struct dma_chan *chan, unsigned long flags); |
581 | struct dma_async_tx_descriptor *(*device_prep_dma_sg)( | 576 | struct dma_async_tx_descriptor *(*device_prep_dma_sg)( |