Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / scsi / qla4xxx / ql4_mbx.c

diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 2d2f9c879bfd57994366e050f9a82bc2541a4030..f65626aec7c18bace0701f7b43551f2c4f8eb817 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -1,6 +1,6 @@
 /*
  * QLogic iSCSI HBA Driver
- * Copyright (c)  2003-2006 QLogic Corporation
+ * Copyright (c)  2003-2010 QLogic Corporation
  *
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
@@ -81,23 +81,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
         */
        spin_lock_irqsave(&ha->hardware_lock, flags);
 
-       if (is_qla8022(ha)) {
-               intr_status = readl(&ha->qla4_8xxx_reg->host_int);
-               if (intr_status & ISRX_82XX_RISC_INT) {
-                       /* Service existing interrupt */
-                       DEBUG2(printk("scsi%ld: %s: "
-                           "servicing existing interrupt\n",
-                           ha->host_no, __func__));
-                       intr_status = readl(&ha->qla4_8xxx_reg->host_status);
-                       ha->isp_ops->interrupt_service_routine(ha, intr_status);
-                       clear_bit(AF_MBOX_COMMAND_DONE, &ha->flags);
-                       if (test_bit(AF_INTERRUPTS_ON, &ha->flags) &&
-                           test_bit(AF_INTx_ENABLED, &ha->flags))
-                               qla4_8xxx_wr_32(ha,
-                                   ha->nx_legacy_intr.tgt_mask_reg,
-                                   0xfbff);
-               }
-       } else {
+       if (!is_qla8022(ha)) {
                intr_status = readl(&ha->reg->ctrl_status);
                if (intr_status & CSR_SCSI_PROCESSOR_INTR) {
                        /* Service existing interrupt */
@@ -934,7 +918,7 @@ int qla4xxx_abort_task(struct scsi_qla_host *ha, struct srb *srb)
                return status;
 
        mbox_cmd[0] = MBOX_CMD_ABORT_TASK;
-       mbox_cmd[1] = srb->fw_ddb_index;
+       mbox_cmd[1] = srb->ddb->fw_ddb_index;
        mbox_cmd[2] = index;
        /* Immediate Command Enable */
        mbox_cmd[5] = 0x01;