diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2008-04-03 16:13:15 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-04-07 13:19:13 -0400 |
commit | 0ddda2d1529f2d01d3b043782d2efcf0499fc3db (patch) | |
tree | 4ae361d425ce6cf4c287f36fdef07d985d6af47d /drivers | |
parent | 2ae2b3709542a4b5b691985ecbdf3b79303d9e56 (diff) |
[SCSI] qla2xxx: Remove unused and obsolete #define's.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_gbl.h | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_mbx.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 9 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_settings.h | 14 |
4 files changed, 0 insertions, 27 deletions
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 70af95070aed..97625d49a43c 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h | |||
@@ -151,10 +151,8 @@ qla2x00_issue_iocb(scsi_qla_host_t *, void *, dma_addr_t, size_t); | |||
151 | extern int | 151 | extern int |
152 | qla2x00_abort_command(scsi_qla_host_t *, srb_t *); | 152 | qla2x00_abort_command(scsi_qla_host_t *, srb_t *); |
153 | 153 | ||
154 | #if USE_ABORT_TGT | ||
155 | extern int | 154 | extern int |
156 | qla2x00_abort_target(fc_port_t *); | 155 | qla2x00_abort_target(fc_port_t *); |
157 | #endif | ||
158 | 156 | ||
159 | extern int | 157 | extern int |
160 | qla2x00_get_adapter_id(scsi_qla_host_t *, uint16_t *, uint8_t *, uint8_t *, | 158 | qla2x00_get_adapter_id(scsi_qla_host_t *, uint16_t *, uint8_t *, uint8_t *, |
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 9d92c02fa3d4..898847e4b363 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c | |||
@@ -776,7 +776,6 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp) | |||
776 | return rval; | 776 | return rval; |
777 | } | 777 | } |
778 | 778 | ||
779 | #if USE_ABORT_TGT | ||
780 | /* | 779 | /* |
781 | * qla2x00_abort_target | 780 | * qla2x00_abort_target |
782 | * Issue abort target mailbox command. | 781 | * Issue abort target mailbox command. |
@@ -834,7 +833,6 @@ qla2x00_abort_target(fc_port_t *fcport) | |||
834 | 833 | ||
835 | return rval; | 834 | return rval; |
836 | } | 835 | } |
837 | #endif | ||
838 | 836 | ||
839 | /* | 837 | /* |
840 | * qla2x00_get_adapter_id | 838 | * qla2x00_get_adapter_id |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 2d28937d30c7..661a1596679d 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -816,15 +816,6 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd) | |||
816 | if (qla2x00_wait_for_loop_ready(ha) == QLA_SUCCESS) { | 816 | if (qla2x00_wait_for_loop_ready(ha) == QLA_SUCCESS) { |
817 | if (qla2x00_device_reset(ha, fcport) == 0) | 817 | if (qla2x00_device_reset(ha, fcport) == 0) |
818 | ret = SUCCESS; | 818 | ret = SUCCESS; |
819 | |||
820 | #if defined(LOGOUT_AFTER_DEVICE_RESET) | ||
821 | if (ret == SUCCESS) { | ||
822 | if (fcport->flags & FC_FABRIC_DEVICE) { | ||
823 | ha->isp_ops->fabric_logout(ha, fcport->loop_id); | ||
824 | qla2x00_mark_device_lost(ha, fcport, 0, 0); | ||
825 | } | ||
826 | } | ||
827 | #endif | ||
828 | } else { | 819 | } else { |
829 | DEBUG2(printk(KERN_INFO | 820 | DEBUG2(printk(KERN_INFO |
830 | "%s failed: loop not ready\n",__func__)); | 821 | "%s failed: loop not ready\n",__func__)); |
diff --git a/drivers/scsi/qla2xxx/qla_settings.h b/drivers/scsi/qla2xxx/qla_settings.h index 44069489225b..2801c2664b40 100644 --- a/drivers/scsi/qla2xxx/qla_settings.h +++ b/drivers/scsi/qla2xxx/qla_settings.h | |||
@@ -4,23 +4,9 @@ | |||
4 | * | 4 | * |
5 | * See LICENSE.qla2xxx for copyright and licensing details. | 5 | * See LICENSE.qla2xxx for copyright and licensing details. |
6 | */ | 6 | */ |
7 | /* | ||
8 | * Compile time Options: | ||
9 | * 0 - Disable and 1 - Enable | ||
10 | */ | ||
11 | #define DEBUG_QLA2100 0 /* For Debug of qla2x00 */ | ||
12 | |||
13 | #define USE_ABORT_TGT 1 /* Use Abort Target mbx cmd */ | ||
14 | |||
15 | #define MAX_RETRIES_OF_ISP_ABORT 5 | 7 | #define MAX_RETRIES_OF_ISP_ABORT 5 |
16 | 8 | ||
17 | /* Max time to wait for the loop to be in LOOP_READY state */ | 9 | /* Max time to wait for the loop to be in LOOP_READY state */ |
18 | #define MAX_LOOP_TIMEOUT (60 * 5) | 10 | #define MAX_LOOP_TIMEOUT (60 * 5) |
19 | 11 | ||
20 | /* | ||
21 | * Some vendor subsystems do not recover properly after a device reset. Define | ||
22 | * the following to force a logout after a successful device reset. | ||
23 | */ | ||
24 | #undef LOGOUT_AFTER_DEVICE_RESET | ||
25 | |||
26 | #include "qla_version.h" | 12 | #include "qla_version.h" |