qla2xxx: Fix wrong argument in sp done callback

Orabug: 26844197, 26923029

Callback for sp->done expects scsi_qla_host is passed in as argument,
Instead qla_hw_data is passed in.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index c3c48e844c4c145e148a2d1d84415b86f8abe4df..6c929b88ed0a2141156aaf4fe554db506c159a11 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1215,7 +1215,7 @@ qla2x00_process_completed_request(struct scsi_qla_host *vha,
                req->outstanding_cmds[index] = NULL;
 
                /* Save ISP completion status */
-               sp->done(ha, sp, DID_OK << 16);
+               sp->done(vha, sp, DID_OK << 16);
        } else {
                ql_log(ql_log_warn, vha, 0x3016, "Invalid SCSI SRB.\n");
 
@@ -2400,7 +2400,7 @@ out:
                    resid_len, fw_resid_len, sp, cp);
 
        if (rsp->status_srb == NULL)
-               sp->done(ha, sp, res);
+               sp->done(vha, sp, res);
 }
 
 /**
@@ -2457,7 +2457,7 @@ qla2x00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)
        /* Place command on done queue. */
        if (sense_len == 0) {
                rsp->status_srb = NULL;
-               sp->done(ha, sp, cp->result);
+               sp->done(vha, sp, cp->result);
        }
 }
 
@@ -2493,7 +2493,7 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)
 
        sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
        if (sp) {
-               sp->done(ha, sp, res);
+               sp->done(vha, sp, res);
                return;
        }
 fatal:

diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index c3f69f4bc150323571b7d058ed29f10301cb73db..c83bd3abb54f5c8fdebc77ae892f48ef7f95dc5d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -2535,7 +2535,7 @@ check_scsi_status:
                    par_sense_len, rsp_info_len);
 
        if (rsp->status_srb == NULL)
-               sp->done(ha, sp, res);
+               sp->done(vha, sp, res);
 }
 
 /**
@@ -2612,7 +2612,7 @@ qlafx00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)
        /* Place command on done queue. */
        if (sense_len == 0) {
                rsp->status_srb = NULL;
-               sp->done(ha, sp, cp->result);
+               sp->done(vha, sp, cp->result);
        }
 }
 
@@ -2693,7 +2693,7 @@ qlafx00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp,
 
        sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
        if (sp) {
-               sp->done(ha, sp, res);
+               sp->done(vha, sp, res);
                return;
        }
 

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 08c928a202d65fe92b67bebba444b0d10c0a98f0..2969a96fb85fbf0074892054b181238776fe305a 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1174,7 +1174,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
        }
 
        spin_lock_irqsave(&ha->hardware_lock, flags);
-       sp->done(ha, sp, 0);
+       sp->done(vha, sp, 0);
        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
        /* Did the command return during mailbox execution? */