From ba112a11a96d9aa4a97d8c1a7b4ff273ed4d5a25 Mon Sep 17 00:00:00 2001
From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Tue, 21 Dec 2010 16:00:25 -0800
Subject: [PATCH] --- yaml --- r: 226878 b: refs/heads/master c:
 0ce87911491d4167198b863c102c7e4d09202561 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_gbl.h | 1 -
 trunk/drivers/scsi/qla2xxx/qla_nx.c  | 3 +--
 trunk/drivers/scsi/qla2xxx/qla_os.c  | 7 -------
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 26a8fe5d1b85..9a25c0099f55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc5c2aad17b045ea28ab69e6149c8130ab20731e
+refs/heads/master: 0ce87911491d4167198b863c102c7e4d09202561
diff --git a/trunk/drivers/scsi/qla2xxx/qla_gbl.h b/trunk/drivers/scsi/qla2xxx/qla_gbl.h
index 39c4bdda5e3e..89e900adb679 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/trunk/drivers/scsi/qla2xxx/qla_gbl.h
@@ -95,7 +95,6 @@ extern int ql2xfwloadbin;
 extern int ql2xetsenable;
 extern int ql2xshiftctondsd;
 extern int ql2xdbwr;
-extern int ql2xdontresethba;
 extern int ql2xasynctmfenable;
 extern int ql2xgffidenable;
 extern int ql2xenabledif;
diff --git a/trunk/drivers/scsi/qla2xxx/qla_nx.c b/trunk/drivers/scsi/qla2xxx/qla_nx.c
index 22b0d781c75a..a971ec31a82e 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_nx.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_nx.c
@@ -3556,8 +3556,7 @@ qla82xx_device_state_handler(scsi_qla_host_t *vha)
 			qla82xx_idc_lock(ha);
 			break;
 		case QLA82XX_DEV_NEED_RESET:
-			if (!ql2xdontresethba)
-				qla82xx_need_reset_handler(vha);
+			qla82xx_need_reset_handler(vha);
 			break;
 		case QLA82XX_DEV_NEED_QUIESCENT:
 			qla82xx_need_qsnt_handler(vha);
diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c
index 51e944fafdc6..c194c23ca1fb 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_os.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_os.c
@@ -147,13 +147,6 @@ MODULE_PARM_DESC(ql2xdbwr,
 	" 0 -- Regular doorbell.\n"
 	" 1 -- CAMRAM doorbell (faster).\n");
 
-int ql2xdontresethba;
-module_param(ql2xdontresethba, int, S_IRUGO);
-MODULE_PARM_DESC(ql2xdontresethba,
-	"Option to specify reset behaviour\n"
-	" 0 (Default) -- Reset on failure.\n"
-	" 1 -- Do not reset on failure.\n");
-
 int ql2xtargetreset = 1;
 module_param(ql2xtargetreset, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xtargetreset,