crypto: cavium - 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/cavium/cpt/cptpf_main.c b/drivers/crypto/cavium/cpt/cptpf_main.c
index 7819490..24d63bd 100644 (file)
--- a/drivers/crypto/cavium/cpt/cptpf_main.c
+++ b/drivers/crypto/cavium/cpt/cptpf_main.c
@@ -569,15 +569,9 @@ static int cpt_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto cpt_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 cpt_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 cpt_err_release_regions;
        }
 

diff --git a/drivers/crypto/cavium/cpt/cptvf_main.c b/drivers/crypto/cavium/cpt/cptvf_main.c
index a152459..f016448 100644 (file)
--- a/drivers/crypto/cavium/cpt/cptvf_main.c
+++ b/drivers/crypto/cavium/cpt/cptvf_main.c
@@ -687,15 +687,9 @@ static int cptvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
        /* Mark as VF driver */
        cptvf->flags |= CPT_FLAG_VF_DRIVER;
-       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 cptvf_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 cptvf_err_release_regions;
        }