[SCSI] qla4xxx: Fix debug level to avoid floods of same message

Move "Incorrect function ID" print message in case INTX interrupt
from DEBUG2 to DEBUG7. This will avoid floods of this message if
DEBUG2 is enabled.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla4xxx/ql4_dbg.h b/drivers/scsi/qla4xxx/ql4_dbg.h
index 5b0afc1..51c365b 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_dbg.h
+++ b/drivers/scsi/qla4xxx/ql4_dbg.h
@@ -12,6 +12,7 @@
 /* #define QL_DEBUG_LEVEL_3  */                /* Output function tracing */
 /* #define QL_DEBUG_LEVEL_4  */
 /* #define QL_DEBUG_LEVEL_5  */
+/* #define QL_DEBUG_LEVEL_7  */
 /* #define QL_DEBUG_LEVEL_9  */
 
 #define QL_DEBUG_LEVEL_2       /* ALways enable error messagess */
@@ -48,6 +49,12 @@
 #define DEBUG5(x)      do {} while (0);
 #endif                         /*  */
 
+#if defined(QL_DEBUG_LEVEL_7)
+#define DEBUG7(x)      do {x; } while (0)
+#else                          /*  */
+#define DEBUG7(x)      do {} while (0)
+#endif                         /*  */
+
 #if defined(QL_DEBUG_LEVEL_9)
 #define DEBUG9(x)      do {x;} while (0);
 #else                          /*  */

diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 1b83dc2..e02a884 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -1099,8 +1099,8 @@ irqreturn_t qla4_82xx_intr_handler(int irq, void *dev_id)
 
        status = qla4_82xx_rd_32(ha, ISR_INT_STATE_REG);
        if (!ISR_IS_LEGACY_INTR_TRIGGERED(status)) {
-               DEBUG2(ql4_printk(KERN_INFO, ha,
-                   "%s legacy Int not triggered\n", __func__));
+               DEBUG7(ql4_printk(KERN_INFO, ha,
+                                 "%s legacy Int not triggered\n", __func__));
                return IRQ_NONE;
        }
 
@@ -1158,7 +1158,7 @@ irqreturn_t qla4_83xx_intr_handler(int irq, void *dev_id)
 
        /* Legacy interrupt is valid if bit31 of leg_int_ptr is set */
        if (!(leg_int_ptr & LEG_INT_PTR_B31)) {
-               DEBUG2(ql4_printk(KERN_ERR, ha,
+               DEBUG7(ql4_printk(KERN_ERR, ha,
                                  "%s: Legacy Interrupt Bit 31 not set, spurious interrupt!\n",
                                  __func__));
                return IRQ_NONE;
@@ -1166,7 +1166,7 @@ irqreturn_t qla4_83xx_intr_handler(int irq, void *dev_id)
 
        /* Validate the PCIE function ID set in leg_int_ptr bits [19..16] */
        if ((leg_int_ptr & PF_BITS_MASK) != ha->pf_bit) {
-               DEBUG2(ql4_printk(KERN_ERR, ha,
+               DEBUG7(ql4_printk(KERN_ERR, ha,
                                  "%s: Incorrect function ID 0x%x in legacy interrupt register, ha->pf_bit = 0x%x\n",
                                  __func__, (leg_int_ptr & PF_BITS_MASK),
                                  ha->pf_bit));