Commit 453cd370 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen

scsi: hptiop: use dma_set_mask

The driver currently uses pci_set_dma_mask despite otherwise using the
generic DMA API.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e4db40e7
...@@ -1309,12 +1309,12 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id) ...@@ -1309,12 +1309,12 @@ static int hptiop_probe(struct pci_dev *pcidev, const struct pci_device_id *id)
/* Enable 64bit DMA if possible */ /* Enable 64bit DMA if possible */
iop_ops = (struct hptiop_adapter_ops *)id->driver_data; 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 (dma_set_mask(&pcidev->dev,
if (pci_set_dma_mask(pcidev, DMA_BIT_MASK(32))) { 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"); printk(KERN_ERR "hptiop: fail to set dma_mask\n");
goto disable_pci_device; goto disable_pci_device;
} }
}
if (pci_request_regions(pcidev, driver_name)) { if (pci_request_regions(pcidev, driver_name)) {
printk(KERN_ERR "hptiop: pci_request_regions failed\n"); printk(KERN_ERR "hptiop: pci_request_regions failed\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment