diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2008-02-02 19:30:14 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2008-02-06 10:12:17 -0700 |
| commit | d909b347591a23c5a2c324fbccd4c9c966f31c67 (patch) | |
| tree | 1092bfdc2722eed041a29752a62836366855c30a /crypto/async_tx/async_xor.c | |
| parent | e73ef9acfd30f36bf7c60237ecffe7bbca8068d6 (diff) | |
| download | lwn-d909b347591a23c5a2c324fbccd4c9c966f31c67.tar.gz lwn-d909b347591a23c5a2c324fbccd4c9c966f31c67.zip | |
async_tx: kill ASYNC_TX_ASSUME_COHERENT
Remove the unused ASYNC_TX_ASSUME_COHERENT flag. Async_tx is
meant to hide the difference between asynchronous hardware and synchronous
software operations, this flag requires clients to understand cache
coherency consequences of the async path.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Diffstat (limited to 'crypto/async_tx/async_xor.c')
| -rw-r--r-- | crypto/async_tx/async_xor.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index 716885a87f07..cb41e6bbbc4d 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -42,23 +42,17 @@ do_async_xor(struct dma_async_tx_descriptor *tx, struct dma_device *device, dma_async_tx_callback cb_fn, void *cb_param) { dma_addr_t dma_addr; - enum dma_data_direction dir; int i; pr_debug("%s: len: %zu\n", __FUNCTION__, len); - dir = (flags & ASYNC_TX_ASSUME_COHERENT) ? - DMA_NONE : DMA_FROM_DEVICE; - - dma_addr = dma_map_page(device->dev, dest, offset, len, dir); + dma_addr = dma_map_page(device->dev, dest, offset, len, + DMA_FROM_DEVICE); tx->tx_set_dest(dma_addr, tx, 0); - dir = (flags & ASYNC_TX_ASSUME_COHERENT) ? - DMA_NONE : DMA_TO_DEVICE; - for (i = 0; i < src_cnt; i++) { dma_addr = dma_map_page(device->dev, src_list[i], - offset, len, dir); + offset, len, DMA_TO_DEVICE); tx->tx_set_src(dma_addr, tx, i); } @@ -106,7 +100,7 @@ do_sync_xor(struct page *dest, struct page **src_list, unsigned int offset, * @src_cnt: number of source pages * @len: length in bytes * @flags: ASYNC_TX_XOR_ZERO_DST, ASYNC_TX_XOR_DROP_DEST, - * ASYNC_TX_ASSUME_COHERENT, ASYNC_TX_ACK, ASYNC_TX_DEP_ACK + * ASYNC_TX_ACK, ASYNC_TX_DEP_ACK * @depend_tx: xor depends on the result of this transaction. * @cb_fn: function to call when the xor completes * @cb_param: parameter to pass to the callback routine @@ -246,7 +240,7 @@ static int page_is_zero(struct page *p, unsigned int offset, size_t len) * @src_cnt: number of source pages * @len: length in bytes * @result: 0 if sum == 0 else non-zero - * @flags: ASYNC_TX_ASSUME_COHERENT, ASYNC_TX_ACK, ASYNC_TX_DEP_ACK + * @flags: ASYNC_TX_ACK, ASYNC_TX_DEP_ACK * @depend_tx: xor depends on the result of this transaction. * @cb_fn: function to call when the xor completes * @cb_param: parameter to pass to the callback routine @@ -270,16 +264,12 @@ async_xor_zero_sum(struct page *dest, struct page **src_list, if (tx) { dma_addr_t dma_addr; - enum dma_data_direction dir; pr_debug("%s: (async) len: %zu\n", __FUNCTION__, len); - dir = (flags & ASYNC_TX_ASSUME_COHERENT) ? - DMA_NONE : DMA_TO_DEVICE; - for (i = 0; i < src_cnt; i++) { dma_addr = dma_map_page(device->dev, src_list[i], - offset, len, dir); + offset, len, DMA_TO_DEVICE); tx->tx_set_src(dma_addr, tx, i); } |