scsi: pm8001: switch to generic DMA API

Switch from the legacy PCI DMA API to the generic DMA API.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Jack Wang <jinpu.wang@profitbricks.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

1 files changed, 5 insertions, 23 deletions

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 501830caba21..d71e7e4ec29c 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -152,7 +152,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha)
 
         for (i = 0; i < USI_MAX_MEMCNT; i++) {
                 if (pm8001_ha->memoryMap.region[i].virt_ptr != NULL) {
-                        pci_free_consistent(pm8001_ha->pdev,
+                        dma_free_coherent(&pm8001_ha->pdev->dev,
                                 (pm8001_ha->memoryMap.region[i].total_len +
                                 pm8001_ha->memoryMap.region[i].alignment),
                                 pm8001_ha->memoryMap.region[i].virt_ptr,
@@ -501,30 +501,12 @@ static int pci_go_44(struct pci_dev *pdev)
 {
         int rc;
 
-        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(44))) {
-                rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(44));
-                if (rc) {
-                        rc = pci_set_consistent_dma_mask(pdev,
-                                DMA_BIT_MASK(32));
-                        if (rc) {
-                                dev_printk(KERN_ERR, &pdev->dev,
-                                        "44-bit DMA enable failed\n");
-                                return rc;
-                        }
-                }
-        } else {
-                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-                if (rc) {
+        rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));
+        if (rc) {
+                rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+                if (rc)
                         dev_printk(KERN_ERR, &pdev->dev,
                                 "32-bit DMA enable failed\n");
-                        return rc;
-                }
-                rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
-                if (rc) {
-                        dev_printk(KERN_ERR, &pdev->dev,
-                                "32-bit consistent DMA enable failed\n");
-                        return rc;
-                }
         }
         return rc;
 }