Commit 6e422cce authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Herbert Xu
Browse files

crypto: qat - simplify code and axe the use of a deprecated API 



The wrappers in include/linux/pci-dma-compat.h should go away.

Replace 'pci_set_dma_mask/pci_set_consistent_dma_mask' by an equivalent
and less verbose 'dma_set_mask_and_coherent()' call.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Co-developed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fe4d5577

drivers/crypto/qat/qat_4xxx/adf_drv.c

+4 −10
Original line number Diff line number Diff line
@@ -221,16 +221,10 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	/* Set DMA identifier */

	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {

		if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (ret) {

		dev_err(&pdev->dev, "No usable DMA configuration.\n");

			ret = -EFAULT;

		goto out_err;

		} else {

			pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		}

	} else {

		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	}



	/* Get accelerator capabilities mask */

drivers/crypto/qat/qat_c3xxx/adf_drv.c

+4 −11
Original line number Diff line number Diff line
@@ -159,17 +159,10 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	/* set dma identifier */

	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {

		if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (ret) {

		dev_err(&pdev->dev, "No usable DMA configuration\n");

			ret = -EFAULT;

		goto out_err_disable;

		} else {

			pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		}



	} else {

		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	}



	if (pci_request_regions(pdev, ADF_C3XXX_DEVICE_NAME)) {

drivers/crypto/qat/qat_c3xxxvf/adf_drv.c

+4 −11
Original line number Diff line number Diff line
@@ -141,17 +141,10 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	/* set dma identifier */

	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {

		if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (ret) {

		dev_err(&pdev->dev, "No usable DMA configuration\n");

			ret = -EFAULT;

		goto out_err_disable;

		} else {

			pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		}



	} else {

		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	}



	if (pci_request_regions(pdev, ADF_C3XXXVF_DEVICE_NAME)) {

drivers/crypto/qat/qat_c62x/adf_drv.c

+4 −11
Original line number Diff line number Diff line
@@ -159,17 +159,10 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	/* set dma identifier */

	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {

		if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (ret) {

		dev_err(&pdev->dev, "No usable DMA configuration\n");

			ret = -EFAULT;

		goto out_err_disable;

		} else {

			pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		}



	} else {

		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	}



	if (pci_request_regions(pdev, ADF_C62X_DEVICE_NAME)) {

drivers/crypto/qat/qat_c62xvf/adf_drv.c

+4 −11
Original line number Diff line number Diff line
@@ -141,17 +141,10 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	/* set dma identifier */

	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {

		if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (ret) {

		dev_err(&pdev->dev, "No usable DMA configuration\n");

			ret = -EFAULT;

		goto out_err_disable;

		} else {

			pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		}



	} else {

		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	}



	if (pci_request_regions(pdev, ADF_C62XVF_DEVICE_NAME)) {