Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f581a3f7 authored by Vikas Chaudhary's avatar Vikas Chaudhary Committed by James Bottomley
Browse files

[SCSI] qla4xxx: Trivial cleanup 



* cleanup function qla4xxx_recovery_timeout
	- No need to wakeup dpc thread from function
	qla4xxx_recovery_timeout() as we are not doing anything
	in do_dpc() thread when wakeup from
	qla4xxx_recovery_timeout()

* cleanup function qla4xxx_wait_for_hba_online
	- Remove hard coded value from qla4xxx_wait_for_hba_online().

* cleanup function qla4xxx_start_firmware_from_flash
	- display seconds

* cleanup function  qla4_8xxx_load_risc
	- Remove redundant code.

* cleanup function qla4xxx_get_firmware_status
	- update debug statement

* cleanup function qla4_8xxx_try_start_fw
	- update return status

Signed-off-by: default avatarVikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: default avatarRavi Anand <ravi.anand@qlogic.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 986fe6c7

drivers/scsi/qla4xxx/ql4_def.h

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ static inline int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) 
#define IOCB_TOV_MARGIN			10

#define RELOGIN_TOV			18

#define ISNS_DEREG_TOV			5

#define HBA_ONLINE_TOV			30



#define MAX_RESET_HA_RETRIES		2

drivers/scsi/qla4xxx/ql4_init.c

+2 −2
Original line number Diff line number Diff line
@@ -1207,8 +1207,8 @@ static int qla4xxx_start_firmware_from_flash(struct scsi_qla_host *ha) 
			break;



		DEBUG2(printk(KERN_INFO "scsi%ld: %s: Waiting for boot "

			      "firmware to complete... ctrl_sts=0x%x\n",

			      ha->host_no, __func__, ctrl_status));

		    "firmware to complete... ctrl_sts=0x%x, remaining=%ld\n",

		    ha->host_no, __func__, ctrl_status, max_wait_time));



		msleep_interruptible(250);

	} while (!time_after_eq(jiffies, max_wait_time));

drivers/scsi/qla4xxx/ql4_mbx.c

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ int qla4xxx_get_firmware_status(struct scsi_qla_host * ha) 
	}



	ql4_printk(KERN_INFO, ha, "%ld firmare IOCBs available (%d).\n",

	    ha->host_no, mbox_cmd[2]);

	    ha->host_no, mbox_sts[2]);



	return QLA_SUCCESS;

}

drivers/scsi/qla4xxx/ql4_nx.c

+7 −16
Original line number Diff line number Diff line
@@ -1540,10 +1540,12 @@ qla4_8xxx_try_start_fw(struct scsi_qla_host *ha) 
	ql4_printk(KERN_INFO, ha,

	    "FW: Attempting to load firmware from flash...\n");

	rval = qla4_8xxx_start_firmware(ha, ha->hw.flt_region_fw);

	if (rval == QLA_SUCCESS)

		return rval;



	ql4_printk(KERN_ERR, ha, "FW: Load firmware from flash FAILED...\n");

	if (rval != QLA_SUCCESS) {

		ql4_printk(KERN_ERR, ha, "FW: Load firmware from flash"

		    " FAILED...\n");

		return rval;

	}



	return rval;

}
@@ -1764,20 +1766,9 @@ int qla4_8xxx_load_risc(struct scsi_qla_host *ha) 
	int retval;

	retval = qla4_8xxx_device_state_handler(ha);



	if (retval == QLA_SUCCESS &&

	    !test_bit(AF_INIT_DONE, &ha->flags)) {

	if (retval == QLA_SUCCESS && !test_bit(AF_INIT_DONE, &ha->flags))

		retval = qla4xxx_request_irqs(ha);

		if (retval != QLA_SUCCESS) {

			ql4_printk(KERN_WARNING, ha,

			    "Failed to reserve interrupt %d already in use.\n",

			    ha->pdev->irq);

		} else {

			set_bit(AF_IRQ_ATTACHED, &ha->flags);

			ha->host->irq = ha->pdev->irq;

			ql4_printk(KERN_INFO, ha, "%s: irq %d attached\n",

			    __func__, ha->pdev->irq);

		}

	}



	return retval;

}

drivers/scsi/qla4xxx/ql4_os.c

+1 −3
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ static void qla4xxx_recovery_timedout(struct iscsi_cls_session *session) 
			      "of (%d) secs exhausted, marking device DEAD.\n",

			      ha->host_no, __func__, ddb_entry->fw_ddb_index,

			      QL4_SESS_RECOVERY_TMO));



		qla4xxx_wake_dpc(ha);

	}

}
@@ -1960,7 +1958,7 @@ static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha) 
{

	unsigned long wait_online;



	wait_online = jiffies + (30 * HZ);

	wait_online = jiffies + (HBA_ONLINE_TOV * HZ);

	while (time_before(jiffies, wait_online)) {



		if (adapter_up(ha))