Commit 759ad097 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

acard_ahci: use dma_set_mask_and_coherent 



Use the dma_set_mask_and_coherent helper to set the DMA mask.  Rely
on the relatively recent change that setting a larger than required
mask will never fail to avoid the need for the boilerplate 32-bit
fallback code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 12ce6b0d

drivers/ata/acard-ahci.c

+5 −33
Original line number Diff line number Diff line
@@ -160,37 +160,6 @@ static int acard_ahci_pci_device_resume(struct pci_dev *pdev) 
}

#endif



static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)

{

	int rc;



	if (using_dac &&

	    !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {

		rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));

		if (rc) {

			rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

			if (rc) {

				dev_err(&pdev->dev,

					   "64-bit DMA enable failed\n");

				return rc;

			}

		}

	} else {

		rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev, "32-bit DMA enable failed\n");

			return rc;

		}

		rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev,

				"32-bit consistent DMA enable failed\n");

			return rc;

		}

	}

	return 0;

}



static void acard_ahci_pci_print_info(struct ata_host *host)

{

	struct pci_dev *pdev = to_pci_dev(host->dev);
@@ -471,9 +440,12 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id 
	}



	/* initialize adapter */

	rc = acard_ahci_configure_dma_masks(pdev, hpriv->cap & HOST_CAP_64);

	if (rc)

	rc = dma_set_mask_and_coherent(&pdev->dev,

			DMA_BIT_MASK((hpriv->cap & HOST_CAP_64) ? 64 : 32));

	if (rc) {

		dev_err(&pdev->dev, "DMA enable failed\n");

		return rc;

	}



	rc = ahci_reset_controller(host);

	if (rc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE