dfa86b01e5
This patch brings the crypto4xx driver up to the latest upstream changes. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 750afb08ca71310fcf0c4e2cb1565c63b8235b60 Mon Sep 17 00:00:00 2001
|
|
From: Luis Chamberlain <mcgrof@kernel.org>
|
|
Date: Fri, 4 Jan 2019 09:23:09 +0100
|
|
Subject: [PATCH 05/15] cross-tree: phase out dma_zalloc_coherent()
|
|
|
|
We already need to zero out memory for dma_alloc_coherent(), as such
|
|
using dma_zalloc_coherent() is superflous. Phase it out.
|
|
|
|
This change was generated with the following Coccinelle SmPL patch:
|
|
|
|
@ replace_dma_zalloc_coherent @
|
|
expression dev, size, data, handle, flags;
|
|
@@
|
|
|
|
-dma_zalloc_coherent(dev, size, handle, flags)
|
|
+dma_alloc_coherent(dev, size, handle, flags)
|
|
|
|
Suggested-by: Christoph Hellwig <hch@lst.de>
|
|
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
|
|
[hch: re-ran the script on the latest tree]
|
|
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
|
---
|
|
drivers/crypto/amcc/crypto4xx_core.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/crypto/amcc/crypto4xx_core.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_core.c
|
|
@@ -283,9 +283,9 @@ static u32 crypto4xx_put_pd_to_pdr(struc
|
|
*/
|
|
static u32 crypto4xx_build_gdr(struct crypto4xx_device *dev)
|
|
{
|
|
- dev->gdr = dma_zalloc_coherent(dev->core_dev->device,
|
|
- sizeof(struct ce_gd) * PPC4XX_NUM_GD,
|
|
- &dev->gdr_pa, GFP_ATOMIC);
|
|
+ dev->gdr = dma_alloc_coherent(dev->core_dev->device,
|
|
+ sizeof(struct ce_gd) * PPC4XX_NUM_GD,
|
|
+ &dev->gdr_pa, GFP_ATOMIC);
|
|
if (!dev->gdr)
|
|
return -ENOMEM;
|
|
|