IB/qib: Clear 6120 hardware error register

[net-next-2.6.git] / drivers / infiniband / hw / qib / qib_iba6120.c

diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index 7b6549fd429b9e9e790aca0c230869e81e5ff322..a5e29dbb9537b128906aae8cb811c6f016c1f42b 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -1355,8 +1355,7 @@ static int qib_6120_bringup_serdes(struct qib_pportdata *ppd)
        hwstat = qib_read_kreg64(dd, kr_hwerrstatus);
        if (hwstat) {
                /* should just have PLL, clear all set, in an case */
-               if (hwstat & ~QLOGIC_IB_HWE_SERDESPLLFAILED)
-                       qib_write_kreg(dd, kr_hwerrclear, hwstat);
+               qib_write_kreg(dd, kr_hwerrclear, hwstat);
                qib_write_kreg(dd, kr_errclear, ERR_MASK(HardwareErr));
        }
 
@@ -3475,14 +3474,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 +3545,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");