Merge tag 'hsi-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[linux.git] / drivers / ata / sata_mv.c

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index da585d2bded655277d698e0285ffeae50b2b17c0..ad385a113391ea95279f65d117890c590b75dbd9 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4314,38 +4314,6 @@ static struct pci_driver mv_pci_driver = {
 
 };
 
-/* move to PCI layer or libata core? */
-static int pci_go_64(struct pci_dev *pdev)
-{
-       int rc;
-
-       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;
-               }
-       }
-
-       return rc;
-}
-
 /**
  *      mv_print_info - Dump key info to kernel log for perusal.
  *      @host: ATA host to print info about
@@ -4430,9 +4398,11 @@ static int mv_pci_init_one(struct pci_dev *pdev,
        host->iomap = pcim_iomap_table(pdev);
        hpriv->base = host->iomap[MV_PRIMARY_BAR];
 
-       rc = pci_go_64(pdev);
-       if (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;
+       }
 
        rc = mv_create_dma_pools(hpriv, &pdev->dev);
        if (rc)