2 files changed, 0 insertions, 11 deletions

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index b993652bfa25..eb5543ef513b 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -996,7 +996,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
                 break;
 
         case ABORT_DEVICE:
-                ha->flags.in_reset = 1;
                 if (qla1280_verbose)
                         printk(KERN_INFO
                                "scsi(%ld:%d:%d:%d): Queueing abort device "
@@ -1010,7 +1009,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
                         printk(KERN_INFO
                                "scsi(%ld:%d:%d:%d): Queueing device reset "
                                "command.\n", ha->host_no, bus, target, lun);
-                ha->flags.in_reset = 1;
                 if (qla1280_device_reset(ha, bus, target) == 0)
                         result = SUCCESS;
                 break;
@@ -1019,7 +1017,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
                 if (qla1280_verbose)
                         printk(KERN_INFO "qla1280(%ld:%d): Issuing BUS "
                                "DEVICE RESET\n", ha->host_no, bus);
-                ha->flags.in_reset = 1;
                 if (qla1280_bus_reset(ha, bus == 0))
                         result = SUCCESS;
 
@@ -1047,7 +1044,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
 
         if (!list_empty(&ha->done_q))
                 qla1280_done(ha);
-        ha->flags.in_reset = 0;
 
         /* If we didn't manage to issue the action, or we have no
          * command to wait for, exit here */
@@ -1636,7 +1632,6 @@ qla1280_enable_intrs(struct scsi_qla_host *ha)
         /* enable risc and host interrupts */
         WRT_REG_WORD(&reg->ictrl, (ISP_EN_INT | ISP_EN_RISC));
         RD_REG_WORD(&reg->ictrl);       /* PCI Posted Write flush */
-        ha->flags.ints_enabled = 1;
 }
 
 static inline void
@@ -1648,7 +1643,6 @@ qla1280_disable_intrs(struct scsi_qla_host *ha)
         /* disable risc and host interrupts */
         WRT_REG_WORD(&reg->ictrl, 0);
         RD_REG_WORD(&reg->ictrl);       /* PCI Posted Write flush */
-        ha->flags.ints_enabled = 0;
 }
 
 /*
@@ -1679,7 +1673,6 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
         ha->flags.reset_active = 0;
         ha->flags.abort_isp_active = 0;
 
-        ha->flags.ints_enabled = 0;
 #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
         if (ia64_platform_is("sn2")) {
                 printk(KERN_INFO "scsi(%li): Enabling SN2 PCI DMA "
diff --git a/drivers/scsi/qla1280.h b/drivers/scsi/qla1280.h
index d245ae07518e..1c1cf3a5af03 100644
--- a/drivers/scsi/qla1280.h
+++ b/drivers/scsi/qla1280.h
@@ -1082,10 +1082,6 @@ struct scsi_qla_host {
                 uint32_t reset_active:1;                /* 3 */
                 uint32_t abort_isp_active:1;            /* 4 */
                 uint32_t disable_risc_code_load:1;      /* 5 */
-                uint32_t enable_64bit_addressing:1;     /* 6 */
-                uint32_t in_reset:1;                    /* 7 */
-                uint32_t ints_enabled:1;
-                uint32_t ignore_nvram:1;
 #ifdef __ia64__
                 uint32_t use_pci_vchannel:1;
 #endif