scsi: aacraid: Fix DMAR issues with iommu=pt

[mirror_ubuntu-zesty-kernel.git] / drivers / scsi / aacraid / aachba.c

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 43d88389e899fb2f992fbf9b1868204437f1c0da..707ee2f5954d0ac0890c6f05967f7acd24157704 100644 (file)
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -2071,20 +2071,15 @@ int aac_get_adapter_info(struct aac_dev* dev)
                expose_physicals = 0;
        }
 
-       if(dev->dac_support != 0) {
-               if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(64)) &&
-                       !pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(64))) {
+       if (dev->dac_support) {
+               if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(64))) {
                        if (!dev->in_reset)
-                               printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
-                                       dev->name, dev->id);
-               } else if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(32)) &&
-                       !pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(32))) {
-                       printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",
-                               dev->name, dev->id);
+                               dev_info(&dev->pdev->dev, "64 Bit DAC enabled\n");
+               } else if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(32))) {
+                       dev_info(&dev->pdev->dev, "DMA mask set failed, 64 Bit DAC disabled\n");
                        dev->dac_support = 0;
                } else {
-                       printk(KERN_WARNING"%s%d: No suitable DMA available.\n",
-                               dev->name, dev->id);
+                       dev_info(&dev->pdev->dev, "No suitable DMA available\n");
                        rcode = -ENOMEM;
                }
        }