scsi: hptiop: use dma_set_mask

The driver currently uses pci_set_dma_mask despite otherwise using the
generic DMA API.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index 2fad7f03aa02089458f5729330b322444ea0c72c..dc52b37a0df8c69b65f90d737e09808dab25c391 100644 (file)
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -1309,11 +1309,11 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id)
 
        /* Enable 64bit DMA if possible */
        iop_ops = (struct hptiop_adapter_ops *)id->driver_data;
-       if (pci_set_dma_mask(pcidev, DMA_BIT_MASK(iop_ops->hw_dma_bit_mask))) {
-               if (pci_set_dma_mask(pcidev, DMA_BIT_MASK(32))) {
-                       printk(KERN_ERR "hptiop: fail to set dma_mask\n");
-                       goto disable_pci_device;
-               }
+       if (dma_set_mask(&pcidev->dev,
+                        DMA_BIT_MASK(iop_ops->hw_dma_bit_mask)) ||
+           dma_set_mask(&pcidev->dev, DMA_BIT_MASK(32))) {
+               printk(KERN_ERR "hptiop: fail to set dma_mask\n");
+               goto disable_pci_device;
        }
 
        if (pci_request_regions(pcidev, driver_name)) {