async_pq: kill a stray dma_map() call and other cleanups

- update the kernel doc for async_syndrome to indicate what NULL in the source list means - whitespace fixups Signed-off-by: Dan Williams <dan.j.williams@intel.com>

async_pq: kill a stray dma_map() call and other cleanups
- update the kernel doc for async_syndrome to indicate what NULL in the source list means - whitespace fixups Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Dan Williams
1 parent 6629542e79
Showing 1 changed file with 8 additions and 7 deletions Side-by-side Diff
crypto/async_tx/async_pq.c
@@ -181,10 +181,14 @@
  * blocks[disks-1] to NULL.  When P or Q is omitted 'len' must be <=
  * PAGE_SIZE as a temporary buffer of this size is used in the
  * synchronous path.  'disks' always accounts for both destination
- * buffers.
+ * buffers.  If any source buffers (blocks[i] where i < disks - 2) are
+ * set to NULL those buffers will be replaced with the raid6_zero_page
+ * in the synchronous path and omitted in the hardware-asynchronous
+ * path.
  *
  * 'blocks' note: if submit->scribble is NULL then the contents of
- * 'blocks' may be overridden
+ * 'blocks' may be overwritten to perform address conversions
+ * (dma_map_page() or page_address()).
  */
 struct dma_async_tx_descriptor *
 async_gen_syndrome(struct page **blocks, unsigned int offset, int disks,
  
@@ -283,13 +287,13 @@
 		if (!P(blocks, disks))
 			dma_flags |= DMA_PREP_PQ_DISABLE_P;
 		else
-			pq[0] = dma_map_page(dev, P(blocks,disks),
+			pq[0] = dma_map_page(dev, P(blocks, disks),
 					     offset, len,
 					     DMA_TO_DEVICE);
 		if (!Q(blocks, disks))
 			dma_flags |= DMA_PREP_PQ_DISABLE_Q;
 		else
-			pq[1] = dma_map_page(dev, Q(blocks,disks),
+			pq[1] = dma_map_page(dev, Q(blocks, disks),
 					     offset, len,
 					     DMA_TO_DEVICE);
  
@@ -303,9 +307,6 @@
 				coefs[src_cnt] = raid6_gfexp[i];
 				src_cnt++;
 			}
-		pq[1] = dma_map_page(dev, Q(blocks,disks),
-				     offset, len,
-				     DMA_TO_DEVICE);
  
 		for (;;) {
 			tx = device->device_prep_dma_pq_val(chan, pq, dma_src,
...	...	@@ -181,10 +181,14 @@
181	181	* blocks[disks-1] to NULL. When P or Q is omitted 'len' must be <=
182	182	* PAGE_SIZE as a temporary buffer of this size is used in the
183	183	* synchronous path. 'disks' always accounts for both destination
184		- * buffers.
	184	+ * buffers. If any source buffers (blocks[i] where i < disks - 2) are
	185	+ * set to NULL those buffers will be replaced with the raid6_zero_page
	186	+ * in the synchronous path and omitted in the hardware-asynchronous
	187	+ * path.
185	188	*
186	189	* 'blocks' note: if submit->scribble is NULL then the contents of
187		- * 'blocks' may be overridden
	190	+ * 'blocks' may be overwritten to perform address conversions
	191	+ * (dma_map_page() or page_address()).
188	192	*/
189	193	struct dma_async_tx_descriptor *
190	194	async_gen_syndrome(struct page **blocks, unsigned int offset, int disks,
191	195
...	...	@@ -283,13 +287,13 @@
283	287	if (!P(blocks, disks))
284	288	dma_flags \|= DMA_PREP_PQ_DISABLE_P;
285	289	else
286		- pq[0] = dma_map_page(dev, P(blocks,disks),
	290	+ pq[0] = dma_map_page(dev, P(blocks, disks),
287	291	offset, len,
288	292	DMA_TO_DEVICE);
289	293	if (!Q(blocks, disks))
290	294	dma_flags \|= DMA_PREP_PQ_DISABLE_Q;
291	295	else
292		- pq[1] = dma_map_page(dev, Q(blocks,disks),
	296	+ pq[1] = dma_map_page(dev, Q(blocks, disks),
293	297	offset, len,
294	298	DMA_TO_DEVICE);
295	299
...	...	@@ -303,9 +307,6 @@
303	307	coefs[src_cnt] = raid6_gfexp[i];
304	308	src_cnt++;
305	309	}
306		- pq[1] = dma_map_page(dev, Q(blocks,disks),
307		- offset, len,
308		- DMA_TO_DEVICE);
309	310
310	311	for (;;) {
311	312	tx = device->device_prep_dma_pq_val(chan, pq, dma_src,