diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/async_tx/async_memcpy.c | 2 | ||||
-rw-r--r-- | crypto/async_tx/async_memset.c | 2 | ||||
-rw-r--r-- | crypto/async_tx/async_tx.c | 4 | ||||
-rw-r--r-- | crypto/async_tx/async_xor.c | 6 |
4 files changed, 6 insertions, 8 deletions
diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c index ddccfb01c416..7117ec6f1b74 100644 --- a/crypto/async_tx/async_memcpy.c +++ b/crypto/async_tx/async_memcpy.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * @src: src page | 35 | * @src: src page |
36 | * @offset: offset in pages to start transaction | 36 | * @offset: offset in pages to start transaction |
37 | * @len: length in bytes | 37 | * @len: length in bytes |
38 | * @flags: ASYNC_TX_ACK, ASYNC_TX_DEP_ACK, | 38 | * @flags: ASYNC_TX_ACK |
39 | * @depend_tx: memcpy depends on the result of this transaction | 39 | * @depend_tx: memcpy depends on the result of this transaction |
40 | * @cb_fn: function to call when the memcpy completes | 40 | * @cb_fn: function to call when the memcpy completes |
41 | * @cb_param: parameter to pass to the callback routine | 41 | * @cb_param: parameter to pass to the callback routine |
diff --git a/crypto/async_tx/async_memset.c b/crypto/async_tx/async_memset.c index 5b5eb99bb244..b2f133885b7f 100644 --- a/crypto/async_tx/async_memset.c +++ b/crypto/async_tx/async_memset.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * @val: fill value | 35 | * @val: fill value |
36 | * @offset: offset in pages to start transaction | 36 | * @offset: offset in pages to start transaction |
37 | * @len: length in bytes | 37 | * @len: length in bytes |
38 | * @flags: ASYNC_TX_ACK, ASYNC_TX_DEP_ACK | 38 | * @flags: ASYNC_TX_ACK |
39 | * @depend_tx: memset depends on the result of this transaction | 39 | * @depend_tx: memset depends on the result of this transaction |
40 | * @cb_fn: function to call when the memcpy completes | 40 | * @cb_fn: function to call when the memcpy completes |
41 | * @cb_param: parameter to pass to the callback routine | 41 | * @cb_param: parameter to pass to the callback routine |
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c index 06eb6cc09fef..3766bc3d7d89 100644 --- a/crypto/async_tx/async_tx.c +++ b/crypto/async_tx/async_tx.c | |||
@@ -223,7 +223,7 @@ async_tx_submit(struct dma_chan *chan, struct dma_async_tx_descriptor *tx, | |||
223 | if (flags & ASYNC_TX_ACK) | 223 | if (flags & ASYNC_TX_ACK) |
224 | async_tx_ack(tx); | 224 | async_tx_ack(tx); |
225 | 225 | ||
226 | if (depend_tx && (flags & ASYNC_TX_DEP_ACK)) | 226 | if (depend_tx) |
227 | async_tx_ack(depend_tx); | 227 | async_tx_ack(depend_tx); |
228 | } | 228 | } |
229 | EXPORT_SYMBOL_GPL(async_tx_submit); | 229 | EXPORT_SYMBOL_GPL(async_tx_submit); |
@@ -231,7 +231,7 @@ EXPORT_SYMBOL_GPL(async_tx_submit); | |||
231 | /** | 231 | /** |
232 | * async_trigger_callback - schedules the callback function to be run after | 232 | * async_trigger_callback - schedules the callback function to be run after |
233 | * any dependent operations have been completed. | 233 | * any dependent operations have been completed. |
234 | * @flags: ASYNC_TX_ACK, ASYNC_TX_DEP_ACK | 234 | * @flags: ASYNC_TX_ACK |
235 | * @depend_tx: 'callback' requires the completion of this transaction | 235 | * @depend_tx: 'callback' requires the completion of this transaction |
236 | * @cb_fn: function to call after depend_tx completes | 236 | * @cb_fn: function to call after depend_tx completes |
237 | * @cb_param: parameter to pass to the callback routine | 237 | * @cb_param: parameter to pass to the callback routine |
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index e0580b0ea533..3cc5dc763b54 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c | |||
@@ -105,7 +105,6 @@ do_async_xor(struct dma_chan *chan, struct page *dest, struct page **src_list, | |||
105 | _cb_param); | 105 | _cb_param); |
106 | 106 | ||
107 | depend_tx = tx; | 107 | depend_tx = tx; |
108 | flags |= ASYNC_TX_DEP_ACK; | ||
109 | 108 | ||
110 | if (src_cnt > xor_src_cnt) { | 109 | if (src_cnt > xor_src_cnt) { |
111 | /* drop completed sources */ | 110 | /* drop completed sources */ |
@@ -168,8 +167,7 @@ do_sync_xor(struct page *dest, struct page **src_list, unsigned int offset, | |||
168 | * @offset: offset in pages to start transaction | 167 | * @offset: offset in pages to start transaction |
169 | * @src_cnt: number of source pages | 168 | * @src_cnt: number of source pages |
170 | * @len: length in bytes | 169 | * @len: length in bytes |
171 | * @flags: ASYNC_TX_XOR_ZERO_DST, ASYNC_TX_XOR_DROP_DEST, | 170 | * @flags: ASYNC_TX_XOR_ZERO_DST, ASYNC_TX_XOR_DROP_DEST, ASYNC_TX_ACK |
172 | * ASYNC_TX_ACK, ASYNC_TX_DEP_ACK | ||
173 | * @depend_tx: xor depends on the result of this transaction. | 171 | * @depend_tx: xor depends on the result of this transaction. |
174 | * @cb_fn: function to call when the xor completes | 172 | * @cb_fn: function to call when the xor completes |
175 | * @cb_param: parameter to pass to the callback routine | 173 | * @cb_param: parameter to pass to the callback routine |
@@ -230,7 +228,7 @@ static int page_is_zero(struct page *p, unsigned int offset, size_t len) | |||
230 | * @src_cnt: number of source pages | 228 | * @src_cnt: number of source pages |
231 | * @len: length in bytes | 229 | * @len: length in bytes |
232 | * @result: 0 if sum == 0 else non-zero | 230 | * @result: 0 if sum == 0 else non-zero |
233 | * @flags: ASYNC_TX_ACK, ASYNC_TX_DEP_ACK | 231 | * @flags: ASYNC_TX_ACK |
234 | * @depend_tx: xor depends on the result of this transaction. | 232 | * @depend_tx: xor depends on the result of this transaction. |
235 | * @cb_fn: function to call when the xor completes | 233 | * @cb_fn: function to call when the xor completes |
236 | * @cb_param: parameter to pass to the callback routine | 234 | * @cb_param: parameter to pass to the callback routine |