sata_sil24: 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_sil24.c b/drivers/ata/sata_sil24.c
index 98aad820692198bd9b4704f74fc62226c3831357..7bef82de53ca972b877236c71aeae849ed8b59e0 100644 (file)
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1301,28 +1301,10 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        host->iomap = iomap;
 
        /* configure and activate the device */
-       if (!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;
-               }
+       rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+       if (rc) {
+               dev_err(&pdev->dev, "DMA enable failed\n");
+               return rc;
        }
 
        /* Set max read request size to 4096.  This slightly increases