diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-18 02:54:40 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-18 02:54:40 +0300 |
| commit | 5260c2b863ef1152445ce93476c95d8c8a727eef (patch) | |
| tree | 59688a1a95c9bc55d712f4e32081fc3b85fa3898 /drivers/ata/pata_atp867x.c | |
| parent | 1e6fa3a33e6dbe4f24bcc4690950f2888d4bed3a (diff) | |
| parent | c312ef176399e04fc5f7f2809d9a589751fbf6d9 (diff) | |
| download | linux-5260c2b863ef1152445ce93476c95d8c8a727eef.tar.xz | |
Merge tag 'for-5.4/libata-2019-09-15' of git://git.kernel.dk/linux-block
Pull libata updates from Jens Axboe:
- Kill unused export (Andy)
- Use dma_set_mask_and_coherent() throughout (Christoph)
- Drop PCS quirk on Denverton, which has different register layout
(Dan)
- Support non-boot time detection for pata_buddha (Max)
* tag 'for-5.4/libata-2019-09-15' of git://git.kernel.dk/linux-block:
libata/ahci: Drop PCS quirk for Denverton and beyond
ahci: Do not export local variable ahci_em_messages
libata: switch remaining drivers to use dma_set_mask_and_coherent
sata_sil24: use dma_set_mask_and_coherent
sata_qstor: use dma_set_mask_and_coherent
sata_nv: use dma_set_mask_and_coherent
sata_mv: use dma_set_mask_and_coherent
pdc_adma: use dma_set_mask_and_coherent
ahci: use dma_set_mask_and_coherent
acard_ahci: use dma_set_mask_and_coherent
ata/pata_buddha: Probe via modalias instead of initcall
Diffstat (limited to 'drivers/ata/pata_atp867x.c')
| -rw-r--r-- | drivers/ata/pata_atp867x.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c index 2b9ed4ddef8d..cfd0cf2cbca6 100644 --- a/drivers/ata/pata_atp867x.c +++ b/drivers/ata/pata_atp867x.c @@ -463,12 +463,7 @@ static int atp867x_ata_pci_sff_init_host(struct ata_host *host) atp867x_fixup(host); - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); - if (rc) - return rc; - - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); - return rc; + return dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); } static int atp867x_init_one(struct pci_dev *pdev, |