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

Commit 94c58148 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

pdc_adma: 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 b1716871

drivers/ata/pdc_adma.c

+4 −19
Original line number Diff line number Diff line
@@ -572,23 +572,6 @@ static void adma_host_init(struct ata_host *host, unsigned int chip_id) 
		adma_reset_engine(host->ports[port_no]);

}



static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)

{

	int rc;



	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 int adma_ata_init_one(struct pci_dev *pdev,

			     const struct pci_device_id *ent)

{
@@ -619,9 +602,11 @@ static int adma_ata_init_one(struct pci_dev *pdev, 
	host->iomap = pcim_iomap_table(pdev);

	mmio_base = host->iomap[ADMA_MMIO_BAR];



	rc = adma_set_dma_masks(pdev, mmio_base);

	if (rc)

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

	if (rc) {

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

		return rc;

	}



	for (port_no = 0; port_no < ADMA_PORTS; ++port_no) {

		struct ata_port *ap = host->ports[port_no];