Merge tag 'for-5.4/libata-2019-09-15' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / ata / libata-sff.c

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 4f115ad..4ed682d 100644 (file)
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -3153,15 +3153,9 @@ void ata_pci_bmdma_init(struct ata_host *host)
         * ->sff_irq_clear method.  Try to initialize bmdma_addr
         * regardless of dma masks.
         */
-       rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
+       rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
        if (rc)
                ata_bmdma_nodma(host, "failed to set dma mask");
-       if (!rc) {
-               rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
-               if (rc)
-                       ata_bmdma_nodma(host,
-                                       "failed to set consistent dma mask");
-       }
 
        /* request and iomap DMA region */
        rc = pcim_iomap_regions(pdev, 1 << 4, dev_driver_string(gdev));