Printk cleanups and minor fixes

git-svn-id: https://scst.svn.sourceforge.net/svnroot/scst/trunk@1259 d57e44dd-8a1f-0410-8b47-8ef2f437770f

diff --git a/qla2x00t/qla2x_tgt.h b/qla2x00t/qla2x_tgt.h
index df7ed72..687da43 100644 (file)
--- a/qla2x00t/qla2x_tgt.h
+++ b/qla2x00t/qla2x_tgt.h
@@ -104,7 +104,7 @@ __qla2x00_send_enable_lun(scsi_qla_host_t *ha, int enable)
                qla_clear_tgt_mode(ha);
 #if defined(QL_DEBUG_LEVEL_2) || defined(QL_DEBUG_LEVEL_3)
        if (!pkt)
-               printk("%s: **** FAILED ****\n", __func__);
+               printk(KERN_ERR "%s: **** FAILED ****\n", __func__);
 #endif
 
        return;

diff --git a/qla2x00t/qla_attr.c b/qla2x00t/qla_attr.c
index bea818b..e0c9bc1 100644 (file)
--- a/qla2x00t/qla_attr.c
+++ b/qla2x00t/qla_attr.c
@@ -69,8 +69,8 @@ qla2x00_store_class2_enabled(struct device *dev,
                break;
        default:
 #if defined(QL_DEBUG_LEVEL_9) || defined(QL_DEBUG_LEVEL_11)
-               qla_printk(KERN_ERR "%s: Requested action not understood: %s\n",
-                      __func__, buffer);
+               qla_printk(KERN_ERR, ha, "%s: Requested action not understood: "
+                       "%s\n", __func__, buffer);
 #endif
                res = -EINVAL;
                goto out_unlock;

diff --git a/qla2x00t/qla_init.c b/qla2x00t/qla_init.c
index 14fdd93..de97147 100644 (file)
--- a/qla2x00t/qla_init.c
+++ b/qla2x00t/qla_init.c
@@ -1432,8 +1432,8 @@ qla2x00_fw_ready(scsi_qla_host_t *ha)
            ha->host_no, state[0], jiffies));
 
        if (rval != QLA_SUCCESS) {
-               DEBUG2_3(printk("scsi(%ld): Firmware not ready (%x).\n",
-                   ha->host_no, rval));
+               DEBUG2_3(printk(KERN_INFO "scsi(%ld): Firmware not ready "
+                   "(%x).\n", ha->host_no, rval));
        }
 
        return (rval);

diff --git a/qla2x00t/qla_isr.c b/qla2x00t/qla_isr.c
index 3a33a46..cdec964 100644 (file)
--- a/qla2x00t/qla_isr.c
+++ b/qla2x00t/qla_isr.c
@@ -406,7 +406,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                break;
 
        case MBA_ATIO_TRANSFER_ERR:     /* ATIO Queue Transfer Error */
-               DEBUG2(printk("scsi(%ld): ATIO Transfer Error.\n",
+               DEBUG2(printk(KERN_INFO "scsi(%ld): ATIO Transfer Error.\n",
                    ha->host_no));
                qla_printk(KERN_WARNING, ha, "ATIO Transfer Error.\n");
 
@@ -581,13 +581,11 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                            "ignored %04x/%04x/%04x.\n", ha->host_no, mb[1],
                            mb[2], mb[3]));
 #ifdef CONFIG_SCSI_QLA2XXX_TARGET
-                       DEBUG2(printk("scsi(%ld): ha state %d init_done %d "
-                                     "oper_mode %d topo %d\n",
-                                     ha->host_no,
-                                     atomic_read(&ha->loop_state),
-                                     ha->flags.init_done,
-                                     ha->operating_mode,
-                                     ha->current_topology));
+                       DEBUG2(printk(KERN_INFO "scsi(%ld): ha state %d "
+                               "init_done %d oper_mode %d topo %d\n",
+                               ha->host_no, atomic_read(&ha->loop_state),
+                               ha->flags.init_done, ha->operating_mode,
+                               ha->current_topology));
                        if (qla_target.tgt_async_event)
                                qla_target.tgt_async_event(mb[0], ha, mb);
 #endif
@@ -722,15 +720,15 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                break;
 
        case MBA_LOOP_INIT_ERR:
-               printk("scsi(%ld): Loop init error received -- "
+               printk(KERN_INFO "scsi(%ld): Loop init error received -- "
                    "%04x %04x %04x.\n", ha->host_no, mb[1], mb[2],
                    mb[3]);
                break;
 
        default:
-               printk("scsi(%ld): Unhandled async event %d received -- "
-                   "%04x %04x %04x.\n", ha->host_no, mb[0], mb[1], mb[2],
-                   mb[3]);
+               printk(KERN_INFO "scsi(%ld): Unhandled async event %d "
+                   "received -- %04x %04x %04x.\n", ha->host_no,
+                   mb[0], mb[1], mb[2], mb[3]);
                break;
        }
 
@@ -890,7 +888,7 @@ qla2x00_process_response_queue(struct scsi_qla_host *ha)
        while (ha->response_ring_ptr->signature != RESPONSE_PROCESSED) {
                pkt = (sts_entry_t *)ha->response_ring_ptr;
 
-               DEBUG5(printk("%s(): IOCB data:\n", __func__));
+               DEBUG5(printk(KERN_INFO "%s(): IOCB data:\n", __func__));
                DEBUG5(qla2x00_dump_buffer((uint8_t *)pkt, RESPONSE_ENTRY_SIZE));
 
                ha->rsp_ring_index++;
@@ -1532,13 +1530,13 @@ qla24xx_mbx_completion(scsi_qla_host_t *ha, uint16_t mb0)
        }
 
 #if defined(QL_DEBUG_LEVEL_1)
-       printk("scsi(%ld): Mailbox registers:", ha->host_no);
+       printk(KERN_INFO "scsi(%ld): Mailbox registers:", ha->host_no);
        for (cnt = 0; cnt < ha->mbx_count; cnt++) {
                if ((cnt % 4) == 0)
-                       printk("\n");
+                       printk(KERN_CONT "\n");
                printk("mbox %02d: 0x%04x   ", cnt, ha->mailbox_out[cnt]);
        }
-       printk("\n");
+       printk(KERN_CONT "\n");
 #endif
 }
 
@@ -1561,7 +1559,7 @@ qla24xx_process_atio_queue(struct scsi_qla_host *ha)
                pkt = ha->atio_ring_ptr;
                cnt = pkt->entry_count;
 
-               DEBUG5(printk("%s(): IOCB data:\n", __func__));
+               DEBUG5(printk(KERN_INFO "%s(): IOCB data:\n", __func__));
                DEBUG5(qla2x00_dump_buffer((uint8_t *)pkt, RESPONSE_ENTRY_SIZE));
 
                DEBUG5(printk(KERN_WARNING
@@ -1607,7 +1605,7 @@ qla24xx_process_response_queue(struct scsi_qla_host *ha)
        while (ha->response_ring_ptr->signature != RESPONSE_PROCESSED) {
                pkt = (struct sts_entry_24xx *)ha->response_ring_ptr;
 
-               DEBUG5(printk("%s(): IOCB data:\n", __func__));
+               DEBUG5(printk(KERN_INFO "%s(): IOCB data:\n", __func__));
                DEBUG5(qla2x00_dump_buffer((uint8_t *)pkt, RESPONSE_ENTRY_SIZE));
 
                ha->rsp_ring_index++;

diff --git a/qla2x00t/qla_mbx.c b/qla2x00t/qla_mbx.c
index 5b0c257..556f1e0 100644 (file)
--- a/qla2x00t/qla_mbx.c
+++ b/qla2x00t/qla_mbx.c
@@ -1025,21 +1025,21 @@ qla2x00_init_firmware(scsi_qla_host_t *ha, uint16_t size)
 #ifdef QL_DEBUG_LEVEL_5
        if (IS_FWI2_CAPABLE(ha)) {
                struct init_cb_24xx *icb = (struct init_cb_24xx *)ha->init_cb;
-               DEBUG5(printk("%s(): firmware_options_1 %x, "
+               DEBUG5(printk(KERN_INFO "%s(): firmware_options_1 %x, "
                        "firmware_options_2 %x, firmware_options_3 %x\n",
                        __func__, icb->firmware_options_1,
                        icb->firmware_options_2, icb->firmware_options_3));
-               DEBUG5(printk("%s(): Control Block:\n", __func__));
+               DEBUG5(printk(KERN_INFO "%s(): Control Block:\n", __func__));
                DEBUG5(qla2x00_dump_buffer((uint8_t *)icb, sizeof(*icb)));
        } else {
                init_cb_t *icb = (init_cb_t *)ha->init_cb;
-               DEBUG5(printk("%s(): firmware_options[0] %x, "
+               DEBUG5(printk(KERN_INFO "%s(): firmware_options[0] %x, "
                        "firmware_options[1] %x, add_firmware_options[0] %x, "
                        "add_firmware_options[1] %x\n", __func__,
                        icb->firmware_options[0], icb->firmware_options[1],
                        icb->add_firmware_options[0],
                        icb->add_firmware_options[1]));
-               DEBUG5(printk("%s(): Control Block:\n", __func__));
+               DEBUG5(printk(KERN_INFO "%s(): Control Block:\n", __func__));
                DEBUG5(qla2x00_dump_buffer((uint8_t *)icb, sizeof(*icb)));
        }
 #endif