libata: switch remaining drivers to use dma_set_mask_and_coherent

Use dma_set_mask_and_coherent instead of separate dma_set_mask and
dma_set_coherent_mask calls.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

14 files changed, 14 insertions, 70 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 10aa27882142..d911514de05c 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -3147,15 +3147,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));
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,
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 099a5c68a4c9..9052148b306d 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -155,14 +155,10 @@ static int cs5520_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 return -ENODEV;
         }
 
-        if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
+        if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {
                 printk(KERN_ERR DRV_NAME ": unable to configure DMA mask.\n");
                 return -ENODEV;
         }
-        if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32))) {
-                printk(KERN_ERR DRV_NAME ": unable to configure consistent DMA mask.\n");
-                return -ENODEV;
-        }
 
         /* Map IO ports and initialize host accordingly */
         iomap[0] = devm_ioport_map(&pdev->dev, cmd_port[0], 8);
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index b2fc023783b1..83974d5eb387 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -221,10 +221,7 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         if (rc)
                 return rc;
         host->iomap = pcim_iomap_table(pdev);
-        rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
+        rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
         if (rc)
                 return rc;
 
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
index 607db1f05f9a..f9255d6fd194 100644
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -123,10 +123,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 return rc;
 
         host->iomap = pcim_iomap_table(dev);
-        rc = dma_set_mask(&dev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&dev->dev, ATA_DMA_MASK);
+        rc = dma_set_mask_and_coherent(&dev->dev, ATA_DMA_MASK);
         if (rc)
                 return rc;
         pci_set_master(dev);
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index b656e1536855..de834fbb6dfe 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -722,11 +722,7 @@ static int pdc2027x_init_one(struct pci_dev *pdev,
                 return rc;
         host->iomap = pcim_iomap_table(pdev);
 
-        rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-
-        rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
+        rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
         if (rc)
                 return rc;
 
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index c14071be4f55..7ab9aea3b630 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -374,10 +374,7 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         host->iomap = pcim_iomap_table(pdev);
 
         /* Setup DMA masks */
-        rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
+        rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
         if (rc)
                 return rc;
         pci_set_master(pdev);
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 790968497dfe..7f99e23bff88 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -862,18 +862,12 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         /* Set dma_mask.  This devices doesn't support 64bit addressing. */
-        rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+        rc = dma_set_mask_and_coherent(&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;
-        }
-
         rc = init_controller(hpriv->mmio_base, hpriv->cached_hctl);
         if (rc) {
                 dev_err(&pdev->dev, "failed to initialize controller\n");
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index f4dfec3b6e42..5fd464765ddc 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -1230,10 +1230,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
         /* initialize adapter */
         pdc_host_init(host);
 
-        rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
+        rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
         if (rc)
                 return rc;
 
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 25b6a52be5ab..e6fbae2f645a 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -757,10 +757,7 @@ static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 return rc;
         host->iomap = pcim_iomap_table(pdev);
 
-        rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
+        rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
         if (rc)
                 return rc;
 
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index b903d55c6c20..f8552559db7f 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -471,10 +471,7 @@ static int k2_sata_init_one(struct pci_dev *pdev, const struct pci_device_id *en
                 ata_port_pbar_desc(ap, 5, offset, "port");
         }
 
-        rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
+        rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
         if (rc)
                 return rc;
 
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index ae8e374d0a77..2277ba0c9c7f 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -1470,10 +1470,7 @@ static int pdc_sata_init_one(struct pci_dev *pdev,
         }
 
         /* configure and activate */
-        rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
+        rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
         if (rc)
                 return rc;
 
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index fcb9245b184f..c7891cc84ea0 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -505,14 +505,7 @@ static int vt6421_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
         for (i = 0; i < host->n_ports; i++)
                 vt6421_init_addrs(host->ports[i]);
 
-        rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-
-        return 0;
+        return dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK);
 }
 
 static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index fd401e9164ef..8fa952cb9f7f 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -371,10 +371,7 @@ static int vsc_sata_init_one(struct pci_dev *pdev,
         /*
          * Use 32 bit DMA mask, because 64 bit address support is poor.
          */
-        rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+        rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
         if (rc)
                 return rc;