From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Date: Thu, 7 Oct 2010 05:48:24 +0000 (-0700)
Subject: [SCSI] qla4xxx: remove "ha->retry_reset_ha_cnt" from wait_for_hba_online
X-Git-Tag: v2.6.37-rc1~6^2~63
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=884292ecee7148fb8f6297c85b98c54a61d95a20;p=profile%2Fivi%2Fkernel-x86-ivi.git

[SCSI] qla4xxx: remove "ha->retry_reset_ha_cnt" from wait_for_hba_online

remove "ha->retry_reset_ha_cnt" from wait_for_hba_online as its
initialize to zero at driver init time so it could always return
QLA_ERROR from wait_for_hba_online() without waiting for hba to
come online.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Ravi Anand <ravi.anand@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
---

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 6e59b59..56962e5 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1966,8 +1966,6 @@ static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha)
 
 		if (adapter_up(ha))
 			return QLA_SUCCESS;
-		else if (ha->retry_reset_ha_cnt == 0)
-			return QLA_ERROR;
 
 		msleep(2000);
 	}