Re: [PATCH] crypto: cavium/zip - Use dma_set_mask_and_coherent to simplify code

[Herbert Xu]

On Sat, Nov 21, 2020 at 08:31:31AM +0100, Christophe JAILLET wrote:
> 'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
> an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
> 
> Signed-off-by: Christophe JAILLET 
> ---
>  drivers/crypto/cavium/zip/zip_main.c | 10 ++
>  1 file changed, 2 insertions(+), 8 deletions(-)

Patch applied.  Thanks.
-- 
Email: Herbert Xu 
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[PATCH] crypto: cavium/zip - Use dma_set_mask_and_coherent to simplify code

[Christophe JAILLET]

'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.

Signed-off-by: Christophe JAILLET 
---
 drivers/crypto/cavium/zip/zip_main.c | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/crypto/cavium/zip/zip_main.c 
b/drivers/crypto/cavium/zip/zip_main.c
index d35216e2f6cd..812b4ac9afd6 100644
--- a/drivers/crypto/cavium/zip/zip_main.c
+++ b/drivers/crypto/cavium/zip/zip_main.c
@@ -263,15 +263,9 @@ static int zip_probe(struct pci_dev *pdev, const struct 
pci_device_id *ent)
goto err_disable_device;
}
 
-   err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));
+   err = dma_set_mask_and_coherent(>dev, DMA_BIT_MASK(48));
if (err) {
-   dev_err(dev, "Unable to get usable DMA configuration\n");
-   goto err_release_regions;
-   }
-
-   err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
-   if (err) {
-   dev_err(dev, "Unable to get 48-bit DMA for allocations\n");
+   dev_err(dev, "Unable to get usable 48-bit DMA configuration\n");
goto err_release_regions;
}
 
-- 
2.27.0