IB/qib: checkpatch fixes
[deliverable/linux.git] / drivers / infiniband / hw / qib / qib_iba6120.c
index 4d352b90750a4595f7c73195cd7382fbbf872ea2..a099ac171e226f1073f4a70ccb680e669b2ff048 100644 (file)
@@ -753,8 +753,8 @@ static void qib_handle_6120_hwerrors(struct qib_devdata *dd, char *msg,
        if (!hwerrs)
                return;
        if (hwerrs == ~0ULL) {
-               qib_dev_err(dd, "Read of hardware error status failed "
-                           "(all bits set); ignoring\n");
+               qib_dev_err(dd,
+                       "Read of hardware error status failed (all bits set); ignoring\n");
                return;
        }
        qib_stats.sps_hwerrs++;
@@ -779,13 +779,14 @@ static void qib_handle_6120_hwerrors(struct qib_devdata *dd, char *msg,
         * or it's occurred within the last 5 seconds.
         */
        if (hwerrs & ~(TXE_PIO_PARITY | RXEMEMPARITYERR_EAGERTID))
-               qib_devinfo(dd->pcidev, "Hardware error: hwerr=0x%llx "
-                        "(cleared)\n", (unsigned long long) hwerrs);
+               qib_devinfo(dd->pcidev,
+                       "Hardware error: hwerr=0x%llx (cleared)\n",
+                       (unsigned long long) hwerrs);
 
        if (hwerrs & ~IB_HWE_BITSEXTANT)
-               qib_dev_err(dd, "hwerror interrupt with unknown errors "
-                           "%llx set\n", (unsigned long long)
-                           (hwerrs & ~IB_HWE_BITSEXTANT));
+               qib_dev_err(dd,
+                       "hwerror interrupt with unknown errors %llx set\n",
+                       (unsigned long long)(hwerrs & ~IB_HWE_BITSEXTANT));
 
        ctrl = qib_read_kreg32(dd, kr_control);
        if ((ctrl & QLOGIC_IB_C_FREEZEMODE) && !dd->diag_client) {
@@ -815,8 +816,9 @@ static void qib_handle_6120_hwerrors(struct qib_devdata *dd, char *msg,
 
        if (hwerrs & HWE_MASK(PowerOnBISTFailed)) {
                isfatal = 1;
-               strlcat(msg, "[Memory BIST test failed, InfiniPath hardware"
-                       " unusable]", msgl);
+               strlcat(msg,
+                       "[Memory BIST test failed, InfiniPath hardware unusable]",
+                       msgl);
                /* ignore from now on, so disable until driver reloaded */
                dd->cspec->hwerrmask &= ~HWE_MASK(PowerOnBISTFailed);
                qib_write_kreg(dd, kr_hwerrmask, dd->cspec->hwerrmask);
@@ -868,8 +870,9 @@ static void qib_handle_6120_hwerrors(struct qib_devdata *dd, char *msg,
                *msg = 0; /* recovered from all of them */
 
        if (isfatal && !dd->diag_client) {
-               qib_dev_err(dd, "Fatal Hardware Error, no longer"
-                           " usable, SN %.16s\n", dd->serial);
+               qib_dev_err(dd,
+                       "Fatal Hardware Error, no longer usable, SN %.16s\n",
+                       dd->serial);
                /*
                 * for /sys status file and user programs to print; if no
                 * trailing brace is copied, we'll know it was truncated.
@@ -1017,9 +1020,9 @@ static void handle_6120_errors(struct qib_devdata *dd, u64 errs)
                                qib_inc_eeprom_err(dd, log_idx, 1);
 
        if (errs & ~IB_E_BITSEXTANT)
-               qib_dev_err(dd, "error interrupt with unknown errors "
-                           "%llx set\n",
-                           (unsigned long long) (errs & ~IB_E_BITSEXTANT));
+               qib_dev_err(dd,
+                       "error interrupt with unknown errors %llx set\n",
+                       (unsigned long long) (errs & ~IB_E_BITSEXTANT));
 
        if (errs & E_SUM_ERRS) {
                qib_disarm_6120_senderrbufs(ppd);
@@ -1089,8 +1092,8 @@ static void handle_6120_errors(struct qib_devdata *dd, u64 errs)
        }
 
        if (errs & ERR_MASK(ResetNegated)) {
-               qib_dev_err(dd, "Got reset, requires re-init "
-                             "(unload and reload driver)\n");
+               qib_dev_err(dd,
+                       "Got reset, requires re-init (unload and reload driver)\n");
                dd->flags &= ~QIB_INITTED;  /* needs re-init */
                /* mark as having had error */
                *dd->devstatusp |= QIB_STATUS_HWERROR;
@@ -1541,8 +1544,9 @@ static noinline void unlikely_6120_intr(struct qib_devdata *dd, u64 istat)
                qib_stats.sps_errints++;
                estat = qib_read_kreg64(dd, kr_errstatus);
                if (!estat)
-                       qib_devinfo(dd->pcidev, "error interrupt (%Lx), "
-                                "but no error bits set!\n", istat);
+                       qib_devinfo(dd->pcidev,
+                               "error interrupt (%Lx), but no error bits set!\n",
+                               istat);
                handle_6120_errors(dd, estat);
        }
 
@@ -1715,16 +1719,16 @@ static void qib_setup_6120_interrupt(struct qib_devdata *dd)
        }
 
        if (!dd->cspec->irq)
-               qib_dev_err(dd, "irq is 0, BIOS error?  Interrupts won't "
-                           "work\n");
+               qib_dev_err(dd,
+                       "irq is 0, BIOS error?  Interrupts won't work\n");
        else {
                int ret;
                ret = request_irq(dd->cspec->irq, qib_6120intr, 0,
                                  QIB_DRV_NAME, dd);
                if (ret)
-                       qib_dev_err(dd, "Couldn't setup interrupt "
-                                   "(irq=%d): %d\n", dd->cspec->irq,
-                                   ret);
+                       qib_dev_err(dd,
+                               "Couldn't setup interrupt (irq=%d): %d\n",
+                               dd->cspec->irq, ret);
        }
 }
 
@@ -1759,8 +1763,9 @@ static void pe_boardname(struct qib_devdata *dd)
                snprintf(dd->boardname, namelen, "%s", n);
 
        if (dd->majrev != 4 || !dd->minrev || dd->minrev > 2)
-               qib_dev_err(dd, "Unsupported InfiniPath hardware revision "
-                           "%u.%u!\n", dd->majrev, dd->minrev);
+               qib_dev_err(dd,
+                       "Unsupported InfiniPath hardware revision %u.%u!\n",
+                       dd->majrev, dd->minrev);
 
        snprintf(dd->boardversion, sizeof(dd->boardversion),
                 "ChipABI %u.%u, %s, InfiniPath%u %u.%u, SW Compat %u\n",
@@ -1833,8 +1838,8 @@ static int qib_6120_setup_reset(struct qib_devdata *dd)
 bail:
        if (ret) {
                if (qib_pcie_params(dd, dd->lbus_width, NULL, NULL))
-                       qib_dev_err(dd, "Reset failed to setup PCIe or "
-                                   "interrupts; continuing anyway\n");
+                       qib_dev_err(dd,
+                               "Reset failed to setup PCIe or interrupts; continuing anyway\n");
                /* clear the reset error, init error/hwerror mask */
                qib_6120_init_hwerrors(dd);
                /* for Rev2 error interrupts; nop for rev 1 */
@@ -1876,8 +1881,9 @@ static void qib_6120_put_tid(struct qib_devdata *dd, u64 __iomem *tidptr,
                }
                pa >>= 11;
                if (pa & ~QLOGIC_IB_RT_ADDR_MASK) {
-                       qib_dev_err(dd, "Physical page address 0x%lx "
-                                   "larger than supported\n", pa);
+                       qib_dev_err(dd,
+                               "Physical page address 0x%lx larger than supported\n",
+                               pa);
                        return;
                }
 
@@ -1941,8 +1947,9 @@ static void qib_6120_put_tid_2(struct qib_devdata *dd, u64 __iomem *tidptr,
                }
                pa >>= 11;
                if (pa & ~QLOGIC_IB_RT_ADDR_MASK) {
-                       qib_dev_err(dd, "Physical page address 0x%lx "
-                                   "larger than supported\n", pa);
+                       qib_dev_err(dd,
+                               "Physical page address 0x%lx larger than supported\n",
+                               pa);
                        return;
                }
 
@@ -2928,8 +2935,9 @@ static int qib_6120_set_loopback(struct qib_pportdata *ppd, const char *what)
                         ppd->dd->unit, ppd->port);
        } else if (!strncmp(what, "off", 3)) {
                ppd->dd->cspec->ibcctrl &= ~SYM_MASK(IBCCtrl, Loopback);
-               qib_devinfo(ppd->dd->pcidev, "Disabling IB%u:%u IBC loopback "
-                           "(normal)\n", ppd->dd->unit, ppd->port);
+               qib_devinfo(ppd->dd->pcidev,
+                       "Disabling IB%u:%u IBC loopback (normal)\n",
+                       ppd->dd->unit, ppd->port);
        } else
                ret = -EINVAL;
        if (!ret) {
@@ -3186,11 +3194,10 @@ static int qib_late_6120_initreg(struct qib_devdata *dd)
        qib_write_kreg(dd, kr_sendpioavailaddr, dd->pioavailregs_phys);
        val = qib_read_kreg64(dd, kr_sendpioavailaddr);
        if (val != dd->pioavailregs_phys) {
-               qib_dev_err(dd, "Catastrophic software error, "
-                           "SendPIOAvailAddr written as %lx, "
-                           "read back as %llx\n",
-                           (unsigned long) dd->pioavailregs_phys,
-                           (unsigned long long) val);
+               qib_dev_err(dd,
+                       "Catastrophic software error, SendPIOAvailAddr written as %lx, read back as %llx\n",
+                       (unsigned long) dd->pioavailregs_phys,
+                       (unsigned long long) val);
                ret = -EINVAL;
        }
        return ret;
@@ -3218,8 +3225,8 @@ static int init_6120_variables(struct qib_devdata *dd)
        dd->revision = readq(&dd->kregbase[kr_revision]);
 
        if ((dd->revision & 0xffffffffU) == 0xffffffffU) {
-               qib_dev_err(dd, "Revision register read failure, "
-                           "giving up initialization\n");
+               qib_dev_err(dd,
+                       "Revision register read failure, giving up initialization\n");
                ret = -ENODEV;
                goto bail;
        }
@@ -3551,8 +3558,8 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev,
                goto bail;
 
        if (qib_pcie_params(dd, 8, NULL, NULL))
-               qib_dev_err(dd, "Failed to setup PCIe or interrupts; "
-                           "continuing anyway\n");
+               qib_dev_err(dd,
+                       "Failed to setup PCIe or interrupts; continuing anyway\n");
        dd->cspec->irq = pdev->irq; /* save IRQ */
 
        /* clear diagctrl register, in case diags were running and crashed */
This page took 0.030396 seconds and 5 git commands to generate.