Commit f85a299f authored Jun 29, 2020 by Bart Van Assche Committed by Martin K. Petersen Jun 30, 2020

scsi: qla2xxx: Make qla2x00_restart_isp() easier to read

Instead of using complicated control flow to only have one return statement
at the end of qla2x00_restart_isp(), return an error status as soon as it
is known that this function will fail.

Link: https://lore.kernel.org/r/20200629225454.22863-9-bvanassche@acm.org

Cc: Nilesh Javali <njavali@marvell.com>
Cc: Quinn Tran <qutran@marvell.com>
Cc: Himanshu Madhani <himanshu.madhani@oracle.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 57fec9f2

drivers/scsi/qla2xxx/qla_init.c

+22 −17

Original line number	Diff line number	Diff line
		@@ -6996,18 +6996,24 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
		static int
		qla2x00_restart_isp(scsi_qla_host_t *vha)
		{
		int status = 0;
		int status;
		struct qla_hw_data *ha = vha->hw;

		/* If firmware needs to be loaded */
		if (qla2x00_isp_firmware(vha)) {
		vha->flags.online = 0;
		status = ha->isp_ops->chip_diag(vha);
		if (!status)
		if (status)
		return status;
		status = qla2x00_setup_chip(vha);
		if (status)
		return status;
		}

		if (!status && !(status = qla2x00_init_rings(vha))) {
		status = qla2x00_init_rings(vha);
		if (status)
		return status;

		clear_bit(RESET_MARKER_NEEDED, &vha->dpc_flags);
		ha->flags.chip_reset_done = 1;

		@@ -7015,17 +7021,16 @@ qla2x00_restart_isp(scsi_qla_host_t *vha)
		qla25xx_init_queues(ha);

		status = qla2x00_fw_ready(vha);
		if (!status) {
		if (status) {
		/* if no cable then assume it's good */
		return vha->device_flags & DFLG_NO_CABLE ? 0 : status;
		}

		/* Issue a marker after FW becomes ready. */
		qla2x00_marker(vha, ha->base_qpair, 0, 0, MK_SYNC_ALL);
		set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
		}

		/* if no cable then assume it's good */
		if ((vha->device_flags & DFLG_NO_CABLE))
		status = 0;
		}
		return (status);
		return 0;
		}

		static int