sata_qstor: 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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 865e5c58bd94883dcc3b1d8758fe4a8792ab22e8..c53c5a47204db12815c6318beec17f0a7d92d42d 100644 (file)
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -537,33 +537,13 @@ static void qs_host_init(struct ata_host *host, unsigned int chip_id)
 static int qs_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
 {
        u32 bus_info = readl(mmio_base + QS_HID_HPHY);
-       int rc, have_64bit_bus = (bus_info & QS_HPHY_64BIT);
-
-       if (have_64bit_bus &&
-           !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-               rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
-               if (rc) {
-                       rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-                       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;
-               }
-       }
-       return 0;
+       int dma_bits = (bus_info & QS_HPHY_64BIT) ? 64 : 32;
+       int rc;
+
+       rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(dma_bits));
+       if (rc)
+               dev_err(&pdev->dev, "%d-bit DMA enable failed\n", dma_bits);
+       return rc;
 }
 
 static int qs_ata_init_one(struct pci_dev *pdev,