CVS Update@linux-mips.org: linux

[ths@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ths@ftp.linux-mips.org  05/07/03 18:32:01

Modified files:
        drivers/scsi   : qla1280.c qla1280.h 

Log message:
        qla1280 patchset from hch: qla1280-remove-dead-flags.

diff -urN linux/drivers/scsi/qla1280.c linux/drivers/scsi/qla1280.c
--- linux/drivers/scsi/qla1280.c        2005/03/18 17:37:44     1.45
+++ linux/drivers/scsi/qla1280.c        2005/07/03 17:32:01     1.46
@@ -996,7 +996,6 @@
                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 @@
                        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 @@
                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 @@
 
        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 */
@@ -1612,7 +1608,6 @@
        /* 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
@@ -1624,7 +1619,6 @@
        /* 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;
 }
 
 /*
@@ -1655,7 +1649,6 @@
        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 -urN linux/drivers/scsi/qla1280.h linux/drivers/scsi/qla1280.h
--- linux/drivers/scsi/qla1280.h        2004/10/25 20:44:35     1.20
+++ linux/drivers/scsi/qla1280.h        2005/07/03 17:32:01     1.21
@@ -1082,10 +1082,6 @@
                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