Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 496d4575 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

sata_mv: 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 94c58148

drivers/ata/sata_mv.c

+4 −34
Original line number Diff line number Diff line
@@ -4314,38 +4314,6 @@ static struct pci_driver mv_pci_driver = { 


};



/* move to PCI layer or libata core? */

static int pci_go_64(struct pci_dev *pdev)

{

	int rc;



	if (!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 rc;

}



/**

 *      mv_print_info - Dump key info to kernel log for perusal.

 *      @host: ATA host to print info about
@@ -4430,9 +4398,11 @@ static int mv_pci_init_one(struct pci_dev *pdev, 
	host->iomap = pcim_iomap_table(pdev);

	hpriv->base = host->iomap[MV_PRIMARY_BAR];



	rc = pci_go_64(pdev);

	if (rc)

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

	if (rc) {

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

		return rc;

	}



	rc = mv_create_dma_pools(hpriv, &pdev->dev);

	if (rc)