diff options
author | Christoph Hellwig <hch@lst.de> | 2005-07-04 11:48:13 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-08-02 12:43:43 -0400 |
commit | a6c42741ace2fee235b6902e76f3c86a01d32146 (patch) | |
tree | ec006ff8cc9d6613f999bcb8a10a8c993cbbb855 /drivers/scsi/qla1280.c | |
parent | 47ba39eead9f4495cd6a3eca39d7c73d0f0d61c9 (diff) |
[SCSI] qla1280: remove dead per-host flag variables
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thiemo Seufer <ths@linux-mips.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla1280.c')
-rw-r--r-- | drivers/scsi/qla1280.c | 7 |
1 files changed, 0 insertions, 7 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) | |||
996 | break; | 996 | break; |
997 | 997 | ||
998 | case ABORT_DEVICE: | 998 | case ABORT_DEVICE: |
999 | ha->flags.in_reset = 1; | ||
1000 | if (qla1280_verbose) | 999 | if (qla1280_verbose) |
1001 | printk(KERN_INFO | 1000 | printk(KERN_INFO |
1002 | "scsi(%ld:%d:%d:%d): Queueing abort device " | 1001 | "scsi(%ld:%d:%d:%d): Queueing abort device " |
@@ -1010,7 +1009,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action) | |||
1010 | printk(KERN_INFO | 1009 | printk(KERN_INFO |
1011 | "scsi(%ld:%d:%d:%d): Queueing device reset " | 1010 | "scsi(%ld:%d:%d:%d): Queueing device reset " |
1012 | "command.\n", ha->host_no, bus, target, lun); | 1011 | "command.\n", ha->host_no, bus, target, lun); |
1013 | ha->flags.in_reset = 1; | ||
1014 | if (qla1280_device_reset(ha, bus, target) == 0) | 1012 | if (qla1280_device_reset(ha, bus, target) == 0) |
1015 | result = SUCCESS; | 1013 | result = SUCCESS; |
1016 | break; | 1014 | break; |
@@ -1019,7 +1017,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action) | |||
1019 | if (qla1280_verbose) | 1017 | if (qla1280_verbose) |
1020 | printk(KERN_INFO "qla1280(%ld:%d): Issuing BUS " | 1018 | printk(KERN_INFO "qla1280(%ld:%d): Issuing BUS " |
1021 | "DEVICE RESET\n", ha->host_no, bus); | 1019 | "DEVICE RESET\n", ha->host_no, bus); |
1022 | ha->flags.in_reset = 1; | ||
1023 | if (qla1280_bus_reset(ha, bus == 0)) | 1020 | if (qla1280_bus_reset(ha, bus == 0)) |
1024 | result = SUCCESS; | 1021 | result = SUCCESS; |
1025 | 1022 | ||
@@ -1047,7 +1044,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action) | |||
1047 | 1044 | ||
1048 | if (!list_empty(&ha->done_q)) | 1045 | if (!list_empty(&ha->done_q)) |
1049 | qla1280_done(ha); | 1046 | qla1280_done(ha); |
1050 | ha->flags.in_reset = 0; | ||
1051 | 1047 | ||
1052 | /* If we didn't manage to issue the action, or we have no | 1048 | /* If we didn't manage to issue the action, or we have no |
1053 | * command to wait for, exit here */ | 1049 | * command to wait for, exit here */ |
@@ -1636,7 +1632,6 @@ qla1280_enable_intrs(struct scsi_qla_host *ha) | |||
1636 | /* enable risc and host interrupts */ | 1632 | /* enable risc and host interrupts */ |
1637 | WRT_REG_WORD(®->ictrl, (ISP_EN_INT | ISP_EN_RISC)); | 1633 | WRT_REG_WORD(®->ictrl, (ISP_EN_INT | ISP_EN_RISC)); |
1638 | RD_REG_WORD(®->ictrl); /* PCI Posted Write flush */ | 1634 | RD_REG_WORD(®->ictrl); /* PCI Posted Write flush */ |
1639 | ha->flags.ints_enabled = 1; | ||
1640 | } | 1635 | } |
1641 | 1636 | ||
1642 | static inline void | 1637 | static inline void |
@@ -1648,7 +1643,6 @@ qla1280_disable_intrs(struct scsi_qla_host *ha) | |||
1648 | /* disable risc and host interrupts */ | 1643 | /* disable risc and host interrupts */ |
1649 | WRT_REG_WORD(®->ictrl, 0); | 1644 | WRT_REG_WORD(®->ictrl, 0); |
1650 | RD_REG_WORD(®->ictrl); /* PCI Posted Write flush */ | 1645 | RD_REG_WORD(®->ictrl); /* PCI Posted Write flush */ |
1651 | ha->flags.ints_enabled = 0; | ||
1652 | } | 1646 | } |
1653 | 1647 | ||
1654 | /* | 1648 | /* |
@@ -1679,7 +1673,6 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha) | |||
1679 | ha->flags.reset_active = 0; | 1673 | ha->flags.reset_active = 0; |
1680 | ha->flags.abort_isp_active = 0; | 1674 | ha->flags.abort_isp_active = 0; |
1681 | 1675 | ||
1682 | ha->flags.ints_enabled = 0; | ||
1683 | #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2) | 1676 | #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2) |
1684 | if (ia64_platform_is("sn2")) { | 1677 | if (ia64_platform_is("sn2")) { |
1685 | printk(KERN_INFO "scsi(%li): Enabling SN2 PCI DMA " | 1678 | printk(KERN_INFO "scsi(%li): Enabling SN2 PCI DMA " |