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

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
...@@ -1301,28 +1301,10 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1301,28 +1301,10 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
host->iomap = iomap; host->iomap = iomap;
/* configure and activate the device */ /* configure and activate the device */
if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) { rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); if (rc) {
if (rc) { dev_err(&pdev->dev, "DMA enable failed\n");
rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); return rc;
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;
}
} }
/* Set max read request size to 4096. This slightly increases /* Set max read request size to 4096. This slightly increases
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment