1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 7d0a8a4c7719..210060420809 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -681,7 +681,7 @@ qla2x00_verify_checksum(scsi_qla_host_t *ha, uint32_t risc_addr)
  * Context:
  *      Kernel context.
  */
-int
+static int
 qla2x00_issue_iocb_timeout(scsi_qla_host_t *ha, void *buffer,
     dma_addr_t phys_addr, size_t size, uint32_t tov)
 {
@@ -784,7 +784,6 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp)
                 DEBUG2_3_11(printk("qla2x00_abort_command(%ld): failed=%x.\n",
                     ha->host_no, rval));
         } else {
-                sp->flags |= SRB_ABORT_PENDING;
                 DEBUG11(printk("qla2x00_abort_command(%ld): done.\n",
                     ha->host_no));
         }
@@ -1469,7 +1468,7 @@ qla24xx_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,
         lg->port_id[0] = al_pa;
         lg->port_id[1] = area;
         lg->port_id[2] = domain;
-        lg->vp_index = cpu_to_le16(ha->vp_idx);
+        lg->vp_index = ha->vp_idx;
         rval = qla2x00_issue_iocb(ha, lg, lg_dma, 0);
         if (rval != QLA_SUCCESS) {
                 DEBUG2_3_11(printk("%s(%ld): failed to issue Login IOCB "
@@ -1724,7 +1723,7 @@ qla24xx_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,
         lg->port_id[0] = al_pa;
         lg->port_id[1] = area;
         lg->port_id[2] = domain;
-        lg->vp_index = cpu_to_le16(ha->vp_idx);
+        lg->vp_index = ha->vp_idx;
         rval = qla2x00_issue_iocb(ha, lg, lg_dma, 0);
         if (rval != QLA_SUCCESS) {
                 DEBUG2_3_11(printk("%s(%ld): failed to issue Logout IOCB "
@@ -2210,7 +2209,6 @@ qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp)
                 rval = QLA_FUNCTION_FAILED;
         } else {
                 DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
-                sp->flags |= SRB_ABORT_PENDING;
         }
 
         dma_pool_free(ha->s_dma_pool, abt, abt_dma);
@@ -2644,12 +2642,11 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *ha,
         struct vp_rpt_id_entry_24xx *rptid_entry)
 {
         uint8_t vp_idx;
+        uint16_t stat = le16_to_cpu(rptid_entry->vp_idx);
         scsi_qla_host_t *vha;
 
         if (rptid_entry->entry_status != 0)
                 return;
-        if (rptid_entry->entry_status != __constant_cpu_to_le16(CS_COMPLETE))
-                return;
 
         if (rptid_entry->format == 0) {
                 DEBUG15(printk("%s:format 0 : scsi(%ld) number of VPs setup %d,"
@@ -2659,17 +2656,17 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *ha,
                         rptid_entry->port_id[2], rptid_entry->port_id[1],
                         rptid_entry->port_id[0]));
         } else if (rptid_entry->format == 1) {
-                vp_idx = LSB(rptid_entry->vp_idx);
+                vp_idx = LSB(stat);
                 DEBUG15(printk("%s:format 1: scsi(%ld): VP[%d] enabled "
                     "- status %d - "
                     "with port id %02x%02x%02x\n",__func__,ha->host_no,
-                    vp_idx, MSB(rptid_entry->vp_idx),
+                    vp_idx, MSB(stat),
                     rptid_entry->port_id[2], rptid_entry->port_id[1],
                     rptid_entry->port_id[0]));
                 if (vp_idx == 0)
                         return;
 
-                if (MSB(rptid_entry->vp_idx) == 1)
+                if (MSB(stat) == 1)
                         return;
 
                 list_for_each_entry(vha, &ha->vp_list, vp_list)
@@ -2982,8 +2979,8 @@ qla84xx_verify_chip(struct scsi_qla_host *ha, uint16_t *status)
         /* We update the firmware with only one data sequence. */
         options |= VCO_END_OF_DATA;
 
-        retry = 0;
         do {
+                retry = 0;
                 memset(mn, 0, sizeof(*mn));
                 mn->p.req.entry_type = VERIFY_CHIP_IOCB_TYPE;
                 mn->p.req.entry_count = 1;