Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

sata_sil24: use dma_set_mask_and_coherent

Browse Source 
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2019-08-26 12:57:24 +02:00 committed by Jens Axboe
parent 440bd77f09
commit dcc02c19cc
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/ata/sata_sil24.c
View File

@ -1301,29 +1301,11 @@ 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) {
rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); dev_err(&pdev->dev, "DMA enable failed\n");
if (rc) {
dev_err(&pdev->dev,
"64-bit DMA enable failed\n");
return rc; 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
* write throughput for pci-e variants. * write throughput for pci-e variants.