aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2005-08-26 22:08:50 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-09-04 20:53:10 -0400
commitc00c72ae01c03d3d172150392419040f8d55ab04 (patch)
treeb0ee920f4720316004729a54a9bd0b8725a4b078 /drivers
parentf7d289f62e2ea911ecb710015efd45c687fa81ce (diff)
[SCSI] qla2xxx: Simplify redundant target/device reset logic.
Remove redundant qla2x00_target_reset() function in favour of the equivalent qla2x00_device_reset(). Update callers of old function. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/qla2xxx/qla_gbl.h3
-rw-r--r--drivers/scsi/qla2xxx/qla_mbx.c52
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c2
3 files changed, 1 insertions, 56 deletions
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 3e1e5fe850a0..5deaa7e6ee60 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -148,9 +148,6 @@ qla2x00_abort_target(fc_port_t *);
148#endif 148#endif
149 149
150extern int 150extern int
151qla2x00_target_reset(scsi_qla_host_t *, struct fc_port *);
152
153extern int
154qla2x00_get_adapter_id(scsi_qla_host_t *, uint16_t *, uint8_t *, uint8_t *, 151qla2x00_get_adapter_id(scsi_qla_host_t *, uint16_t *, uint8_t *, uint8_t *,
155 uint8_t *, uint16_t *); 152 uint8_t *, uint16_t *);
156 153
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 284eb847e50f..953156faafdb 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -984,58 +984,6 @@ qla2x00_abort_target(fc_port_t *fcport)
984#endif 984#endif
985 985
986/* 986/*
987 * qla2x00_target_reset
988 * Issue target reset mailbox command.
989 *
990 * Input:
991 * ha = adapter block pointer.
992 * TARGET_QUEUE_LOCK must be released.
993 * ADAPTER_STATE_LOCK must be released.
994 *
995 * Returns:
996 * qla2x00 local function return status code.
997 *
998 * Context:
999 * Kernel context.
1000 */
1001int
1002qla2x00_target_reset(scsi_qla_host_t *ha, struct fc_port *fcport)
1003{
1004 int rval;
1005 mbx_cmd_t mc;
1006 mbx_cmd_t *mcp = &mc;
1007
1008 DEBUG11(printk("qla2x00_target_reset(%ld): entered.\n", ha->host_no);)
1009
1010 if (atomic_read(&fcport->state) != FCS_ONLINE)
1011 return 0;
1012
1013 mcp->mb[0] = MBC_TARGET_RESET;
1014 if (HAS_EXTENDED_IDS(ha))
1015 mcp->mb[1] = fcport->loop_id;
1016 else
1017 mcp->mb[1] = fcport->loop_id << 8;
1018 mcp->mb[2] = ha->loop_reset_delay;
1019 mcp->out_mb = MBX_2|MBX_1|MBX_0;
1020 mcp->in_mb = MBX_0;
1021 mcp->tov = 30;
1022 mcp->flags = 0;
1023 rval = qla2x00_mailbox_command(ha, mcp);
1024
1025 if (rval != QLA_SUCCESS) {
1026 /*EMPTY*/
1027 DEBUG2_3_11(printk("qla2x00_target_reset(%ld): failed=%x.\n",
1028 ha->host_no, rval);)
1029 } else {
1030 /*EMPTY*/
1031 DEBUG11(printk("qla2x00_target_reset(%ld): done.\n",
1032 ha->host_no);)
1033 }
1034
1035 return rval;
1036}
1037
1038/*
1039 * qla2x00_get_adapter_id 987 * qla2x00_get_adapter_id
1040 * Get adapter ID and topology. 988 * Get adapter ID and topology.
1041 * 989 *
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 0fc37d810e05..29cf3f510935 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1022,7 +1022,7 @@ qla2x00_loop_reset(scsi_qla_host_t *ha)
1022 if (fcport->port_type != FCT_TARGET) 1022 if (fcport->port_type != FCT_TARGET)
1023 continue; 1023 continue;
1024 1024
1025 status = qla2x00_target_reset(ha, fcport); 1025 status = qla2x00_device_reset(ha, fcport);
1026 if (status != QLA_SUCCESS) 1026 if (status != QLA_SUCCESS)
1027 break; 1027 break;
1028 } 1028 }