IB/qib: checkpatch fixes

[deliverable/linux.git] / drivers / infiniband / hw / qib / qib_eeprom.c

diff --git a/drivers/infiniband/hw/qib/qib_eeprom.c b/drivers/infiniband/hw/qib/qib_eeprom.c
index 92d9cfe98a68b1065cd2bcc1ef44d1a7aee78048..4d5d71aaa2b4e53e319b3c9cc57be37291f3cdd7 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_eeprom.c
+++ b/drivers/infiniband/hw/qib/qib_eeprom.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2006, 2007, 2008, 2009 QLogic Corporation. All rights reserved.
+ * Copyright (c) 2012 Intel Corporation. All rights reserved.
+ * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.
  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -160,10 +161,9 @@ void qib_get_eeprom_info(struct qib_devdata *dd)
                if (oguid > bguid[7]) {
                        if (bguid[6] == 0xff) {
                                if (bguid[5] == 0xff) {
-                                       qib_dev_err(dd, "Can't set %s GUID"
-                                                   " from base, wraps to"
-                                                   " OUI!\n",
-                                                   qib_get_unit_name(t));
+                                       qib_dev_err(dd,
+                                               "Can't set %s GUID from base, wraps to OUI!\n",
+                                               qib_get_unit_name(t));
                                        dd->base_guid = 0;
                                        goto bail;
                                }
@@ -182,8 +182,9 @@ void qib_get_eeprom_info(struct qib_devdata *dd)
        len = sizeof(struct qib_flash);
        buf = vmalloc(len);
        if (!buf) {
-               qib_dev_err(dd, "Couldn't allocate memory to read %u "
-                           "bytes from eeprom for GUID\n", len);
+               qib_dev_err(dd,
+                       "Couldn't allocate memory to read %u bytes from eeprom for GUID\n",
+                       len);
                goto bail;
        }
 
@@ -201,23 +202,25 @@ void qib_get_eeprom_info(struct qib_devdata *dd)
 
        csum = flash_csum(ifp, 0);
        if (csum != ifp->if_csum) {
-               qib_devinfo(dd->pcidev, "Bad I2C flash checksum: "
-                        "0x%x, not 0x%x\n", csum, ifp->if_csum);
+               qib_devinfo(dd->pcidev,
+                       "Bad I2C flash checksum: 0x%x, not 0x%x\n",
+                       csum, ifp->if_csum);
                goto done;
        }
        if (*(__be64 *) ifp->if_guid == cpu_to_be64(0) ||
            *(__be64 *) ifp->if_guid == ~cpu_to_be64(0)) {
-               qib_dev_err(dd, "Invalid GUID %llx from flash; ignoring\n",
-                           *(unsigned long long *) ifp->if_guid);
+               qib_dev_err(dd,
+                       "Invalid GUID %llx from flash; ignoring\n",
+                       *(unsigned long long *) ifp->if_guid);
                /* don't allow GUID if all 0 or all 1's */
                goto done;
        }
 
        /* complain, but allow it */
        if (*(u64 *) ifp->if_guid == 0x100007511000000ULL)
-               qib_devinfo(dd->pcidev, "Warning, GUID %llx is "
-                        "default, probably not correct!\n",
-                        *(unsigned long long *) ifp->if_guid);
+               qib_devinfo(dd->pcidev,
+                       "Warning, GUID %llx is default, probably not correct!\n",
+                       *(unsigned long long *) ifp->if_guid);
 
        bguid = ifp->if_guid;
        if (!bguid[0] && !bguid[1] && !bguid[2]) {
@@ -260,8 +263,9 @@ void qib_get_eeprom_info(struct qib_devdata *dd)
                memcpy(dd->serial, ifp->if_serial,
                       sizeof ifp->if_serial);
        if (!strstr(ifp->if_comment, "Tested successfully"))
-               qib_dev_err(dd, "Board SN %s did not pass functional "
-                           "test: %s\n", dd->serial, ifp->if_comment);
+               qib_dev_err(dd,
+                       "Board SN %s did not pass functional test: %s\n",
+                       dd->serial, ifp->if_comment);
 
        memcpy(&dd->eep_st_errs, &ifp->if_errcntp, QIB_EEP_LOG_CNT);
        /*
@@ -323,8 +327,9 @@ int qib_update_eeprom_log(struct qib_devdata *dd)
        buf = vmalloc(len);
        ret = 1;
        if (!buf) {
-               qib_dev_err(dd, "Couldn't allocate memory to read %u "
-                           "bytes from eeprom for logging\n", len);
+               qib_dev_err(dd,
+                       "Couldn't allocate memory to read %u bytes from eeprom for logging\n",
+                       len);
                goto bail;
        }