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

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

sata_sil24: 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 440bd77f

drivers/ata/sata_sil24.c

+4 −22
Original line number Diff line number Diff line
@@ -1301,29 +1301,11 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	host->iomap = iomap;



	/* configure and activate the device */

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

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

	rc = dma_set_mask_and_coherent(&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");

		dev_err(&pdev->dev, "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;

		}

	}



	/* Set max read request size to 4096.  This slightly increases

	 * write throughput for pci-e variants.