2 files changed, 6 insertions, 12 deletions

diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index 7b6549fd429b..1eadadc13da8 100644
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -3475,14 +3475,6 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev,
         struct qib_devdata *dd;
         int ret;
 
-#ifndef CONFIG_PCI_MSI
-        qib_early_err(&pdev->dev, "QLogic PCIE device 0x%x cannot "
-              "work if CONFIG_PCI_MSI is not enabled\n",
-              ent->device);
-        dd = ERR_PTR(-ENODEV);
-        goto bail;
-#endif
-
         dd = qib_alloc_devdata(pdev, sizeof(struct qib_pportdata) +
                                sizeof(struct qib_chip_specific));
         if (IS_ERR(dd))
@@ -3554,10 +3546,6 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev,
         if (qib_mini_init)
                 goto bail;
 
-#ifndef CONFIG_PCI_MSI
-        qib_dev_err(dd, "PCI_MSI not configured, NO interrupts\n");
-#endif
-
         if (qib_pcie_params(dd, 8, NULL, NULL))
                 qib_dev_err(dd, "Failed to setup PCIe or interrupts; "
                             "continuing anyway\n");
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index c0139c07e97e..9b40f345ac3f 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -1237,7 +1237,13 @@ static int __devinit qib_init_one(struct pci_dev *pdev,
          */
         switch (ent->device) {
         case PCI_DEVICE_ID_QLOGIC_IB_6120:
+#ifdef CONFIG_PCI_MSI
                 dd = qib_init_iba6120_funcs(pdev, ent);
+#else
+                qib_early_err(&pdev->dev, "QLogic PCIE device 0x%x cannot "
+                      "work if CONFIG_PCI_MSI is not enabled\n",
+                      ent->device);
+#endif
                 break;
 
         case PCI_DEVICE_ID_QLOGIC_IB_7220: