1 files changed, 3 insertions, 29 deletions

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index f250e5b7897c..d04981848e56 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -852,9 +852,6 @@ qla2x00_process_completed_request(struct scsi_qla_host *vha,
                 /* Free outstanding command slot. */
                 req->outstanding_cmds[index] = NULL;
 
-                CMD_COMPL_STATUS(sp->cmd) = 0L;
-                CMD_SCSI_STATUS(sp->cmd) = 0L;
-
                 /* Save ISP completion status */
                 sp->cmd->result = DID_OK << 16;
 
@@ -955,7 +952,6 @@ qla2x00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t sense_len)
         if (sense_len >= SCSI_SENSE_BUFFERSIZE)
                 sense_len = SCSI_SENSE_BUFFERSIZE;
 
-        CMD_ACTUAL_SNSLEN(cp) = sense_len;
         sp->request_sense_length = sense_len;
         sp->request_sense_ptr = cp->sense_buffer;
         if (sp->request_sense_length > 32)
@@ -973,8 +969,7 @@ qla2x00_handle_sense(srb_t *sp, uint8_t *sense_data, uint32_t sense_len)
             cp->device->channel, cp->device->id, cp->device->lun, cp,
             cp->serial_number));
         if (sense_len)
-                DEBUG5(qla2x00_dump_buffer(cp->sense_buffer,
-                    CMD_ACTUAL_SNSLEN(cp)));
+                DEBUG5(qla2x00_dump_buffer(cp->sense_buffer, sense_len));
 }
 
 /**
@@ -1043,9 +1038,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
         }
 
         lscsi_status = scsi_status & STATUS_MASK;
-        CMD_ENTRY_STATUS(cp) = sts->entry_status;
-        CMD_COMPL_STATUS(cp) = comp_status;
-        CMD_SCSI_STATUS(cp) = scsi_status;
 
         fcport = sp->fcport;
 
@@ -1104,7 +1096,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                 if (scsi_status & (SS_RESIDUAL_UNDER | SS_RESIDUAL_OVER)) {
                         resid = resid_len;
                         scsi_set_resid(cp, resid);
-                        CMD_RESID_LEN(cp) = resid;
 
                         if (!lscsi_status &&
                             ((unsigned)(scsi_bufflen(cp) - resid) <
@@ -1160,7 +1151,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
 
                 if (scsi_status & SS_RESIDUAL_UNDER) {
                         scsi_set_resid(cp, resid);
-                        CMD_RESID_LEN(cp) = resid;
                 } else {
                         DEBUG2(printk(KERN_INFO
                             "scsi(%ld:%d:%d) UNDERRUN status detected "
@@ -1499,7 +1489,6 @@ qla24xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)
 void
 qla24xx_process_response_queue(struct rsp_que *rsp)
 {
-        struct qla_hw_data *ha = rsp->hw;
         struct sts_entry_24xx *pkt;
         struct scsi_qla_host *vha;
 
@@ -1553,7 +1542,7 @@ qla24xx_process_response_queue(struct rsp_que *rsp)
         }
 
         /* Adjust ring index */
-        ha->isp_ops->wrt_rsp_reg(ha, rsp->id, rsp->ring_index);
+        WRT_REG_DWORD(rsp->rsp_q_out, rsp->ring_index);
 }
 
 static void
@@ -2029,7 +2018,7 @@ skip_msix:
 skip_msi:
 
         ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,
-            IRQF_DISABLED|IRQF_SHARED, QLA2XXX_DRIVER_NAME, rsp);
+            IRQF_SHARED, QLA2XXX_DRIVER_NAME, rsp);
         if (ret) {
                 qla_printk(KERN_WARNING, ha,
                     "Failed to reserve interrupt %d already in use.\n",
@@ -2117,18 +2106,3 @@ int qla25xx_request_irq(struct rsp_que *rsp)
         msix->rsp = rsp;
         return ret;
 }
-
-void
-qla25xx_wrt_rsp_reg(struct qla_hw_data *ha, uint16_t id, uint16_t index)
-{
-        device_reg_t __iomem *reg = (void *) ha->mqiobase + QLA_QUE_PAGE * id;
-        WRT_REG_DWORD(&reg->isp25mq.rsp_q_out, index);
-}
-
-void
-qla24xx_wrt_rsp_reg(struct qla_hw_data *ha, uint16_t id, uint16_t index)
-{
-        device_reg_t __iomem *reg = (void *) ha->iobase;
-        WRT_REG_DWORD(&reg->isp24.rsp_q_out, index);
-}
-