[SCSI] qla2xxx: Updates to ISP82xx support.

1) Allow transition to NEED RESET state only from READY state for ISP82xx.
2) Avoid infinite ISP aborts when chip reset fails.
3) Code cleanup to remove some of the unused debug code.

Signed-off-by: Lalit Chandivade <lalit.chandivade@qlogic.com>
Signed-off-by: Santosh Vernekar <santosh.vernekar@qlogic.com>
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h
index 7804bbbb3db3..f8f99a5ea532 100644
--- a/drivers/scsi/qla2xxx/qla_nx.h
+++ b/drivers/scsi/qla2xxx/qla_nx.h
@@ -545,13 +545,14 @@
 #define QLA82XX_CRB_DEV_PART_INFO    (QLA82XX_CAM_RAM(0x14c))
 
 /* Every driver should use these Device State */
-#define QLA82XX_DEV_COLD            1
-#define QLA82XX_DEV_INITIALIZING    2
-#define QLA82XX_DEV_READY           3
-#define QLA82XX_DEV_NEED_RESET      4
-#define QLA82XX_DEV_NEED_QUIESCENT  5
-#define QLA82XX_DEV_FAILED          6
-#define QLA82XX_DEV_QUIESCENT       7
+#define QLA82XX_DEV_COLD                1
+#define QLA82XX_DEV_INITIALIZING        2
+#define QLA82XX_DEV_READY               3
+#define QLA82XX_DEV_NEED_RESET          4
+#define QLA82XX_DEV_NEED_QUIESCENT      5
+#define QLA82XX_DEV_FAILED              6
+#define QLA82XX_DEV_QUIESCENT           7
+#define MAX_STATES                      8 /* Increment if new state added */
 
 #define QLA82XX_IDC_VERSION                     1
 #define QLA82XX_ROM_DEV_INIT_TIMEOUT            30