crypto: marvell/octeontx - Use dma_set_mask_and_coherent to simplify code

'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 <christophe.jaillet@wanadoo.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/marvell/octeontx/otx_cptpf_main.c b/drivers/crypto/marvell/octeontx/otx_cptpf_main.c
index 34bb3063eb707947af3a0247f19476a02dccc38d..14a42559f81d683e1134d450df56be7573732fd3 100644 (file)
--- a/drivers/crypto/marvell/octeontx/otx_cptpf_main.c
+++ b/drivers/crypto/marvell/octeontx/otx_cptpf_main.c
@@ -212,15 +212,9 @@ static int otx_cpt_probe(struct pci_dev *pdev,
                goto err_disable_device;
        }
 
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));
+       err = dma_set_mask_and_coherent(&pdev->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 consistent allocations\n");
+               dev_err(dev, "Unable to get usable 48-bit DMA configuration\n");
                goto err_release_regions;
        }
 

diff --git a/drivers/crypto/marvell/octeontx/otx_cptvf_main.c b/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
index 228fe8e47e0ed43ad47a81f75d0eafe243316802..c076d0b3ad5f1bdc0a63b349b7f0935599a161bc 100644 (file)
--- a/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
+++ b/drivers/crypto/marvell/octeontx/otx_cptvf_main.c
@@ -804,15 +804,9 @@ static int otx_cptvf_probe(struct pci_dev *pdev,
                dev_err(dev, "PCI request regions failed 0x%x\n", err);
                goto disable_device;
        }
-       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));
+       err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
        if (err) {
-               dev_err(dev, "Unable to get usable DMA configuration\n");
-               goto 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 consistent allocations\n");
+               dev_err(dev, "Unable to get usable 48-bit DMA configuration\n");
                goto release_regions;
        }