qla2xxx: Make debug buffer log easier to view.

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 907a7acb163960d204df86273fb51321618d62a7..589cd13b5a0dbf6d5089942514cdd7186f348ae5 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -13,7 +13,7 @@
  * ----------------------------------------------------------------------
  * | Module Init and Probe        |       0x018f       | 0x0146         |
  * |                              |                    | 0x015b-0x0160 |
- * |                              |                    | 0x016e-0x0170  |
+ * |                              |                    | 0x016e                |
  * | Mailbox commands             |       0x1192       |               |
  * |                              |                    |               |
  * | Device Discovery             |       0x2003       | 0x2016                |
@@ -2698,29 +2698,24 @@ ql_dump_regs(uint32_t level, scsi_qla_host_t *vha, int32_t id)
 
 void
 ql_dump_buffer(uint32_t level, scsi_qla_host_t *vha, int32_t id,
-       uint8_t *b, uint32_t size)
+       uint8_t *buf, uint size)
 {
-       uint32_t cnt;
-       uint8_t c;
+       uint cnt;
 
        if (!ql_mask_match(level))
                return;
 
-       ql_dbg(level, vha, id, " 0   1   2   3   4   5   6   7   8   "
-           "9  Ah  Bh  Ch  Dh  Eh  Fh\n");
-       ql_dbg(level, vha, id, "----------------------------------"
-           "----------------------------\n");
-
-       ql_dbg(level, vha, id, " ");
-       for (cnt = 0; cnt < size;) {
-               c = *b++;
-               printk("%02x", (uint32_t) c);
-               cnt++;
-               if (!(cnt % 16))
+       ql_dbg(level, vha, id,
+           "%-+5d  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F\n", size);
+       ql_dbg(level, vha, id,
+           "----- -----------------------------------------------\n");
+       for (cnt = 0; cnt < size; cnt++, buf++) {
+               if (cnt % 16 == 0)
+                       ql_dbg(level, vha, id, "%04x:", cnt & ~0xFU);
+               printk(" %02x", *buf);
+               if (cnt % 16 == 15)
                        printk("\n");
-               else
-                       printk("  ");
        }
-       if (cnt % 16)
-               ql_dbg(level, vha, id, "\n");
+       if (cnt % 16 != 0)
+               printk("\n");
 }