aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-11-23 20:46:01 -0500
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-01-03 17:57:27 -0500
commit23be331d9e5077edf07d73813f870d3b895c8593 (patch)
tree92c6f2b7b79cfd94d51e1741949ad2fd41ee53a4 /drivers/scsi/qla2xxx
parentd8dafd8ccde06f16095234dc3addf52b511805b3 (diff)
[SCSI] qla2xxx: make qla2x00_reg_remote_port() static
Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r--drivers/scsi/qla2xxx/qla_gbl.h1
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c68
2 files changed, 34 insertions, 35 deletions
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 32ebeec45ff0..e4dd12f4b80e 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -45,7 +45,6 @@ extern void qla2x00_update_fcports(scsi_qla_host_t *);
45extern int qla2x00_abort_isp(scsi_qla_host_t *); 45extern int qla2x00_abort_isp(scsi_qla_host_t *);
46 46
47extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *); 47extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *);
48extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *);
49 48
50extern void qla2x00_alloc_fw_dump(scsi_qla_host_t *); 49extern void qla2x00_alloc_fw_dump(scsi_qla_host_t *);
51extern void qla2x00_try_to_stop_firmware(scsi_qla_host_t *); 50extern void qla2x00_try_to_stop_firmware(scsi_qla_host_t *);
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a823f0bc519d..bd3284834cd7 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2103,40 +2103,7 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
2103 } 2103 }
2104} 2104}
2105 2105
2106/* 2106static void
2107 * qla2x00_update_fcport
2108 * Updates device on list.
2109 *
2110 * Input:
2111 * ha = adapter block pointer.
2112 * fcport = port structure pointer.
2113 *
2114 * Return:
2115 * 0 - Success
2116 * BIT_0 - error
2117 *
2118 * Context:
2119 * Kernel context.
2120 */
2121void
2122qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
2123{
2124 fcport->ha = ha;
2125 fcport->login_retry = 0;
2126 fcport->port_login_retry_count = ha->port_down_retry_count *
2127 PORT_RETRY_TIME;
2128 atomic_set(&fcport->port_down_timer, ha->port_down_retry_count *
2129 PORT_RETRY_TIME);
2130 fcport->flags &= ~FCF_LOGIN_NEEDED;
2131
2132 qla2x00_iidma_fcport(ha, fcport);
2133
2134 atomic_set(&fcport->state, FCS_ONLINE);
2135
2136 qla2x00_reg_remote_port(ha, fcport);
2137}
2138
2139void
2140qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport) 2107qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
2141{ 2108{
2142 struct fc_rport_identifiers rport_ids; 2109 struct fc_rport_identifiers rport_ids;
@@ -2179,6 +2146,39 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
2179} 2146}
2180 2147
2181/* 2148/*
2149 * qla2x00_update_fcport
2150 * Updates device on list.
2151 *
2152 * Input:
2153 * ha = adapter block pointer.
2154 * fcport = port structure pointer.
2155 *
2156 * Return:
2157 * 0 - Success
2158 * BIT_0 - error
2159 *
2160 * Context:
2161 * Kernel context.
2162 */
2163void
2164qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
2165{
2166 fcport->ha = ha;
2167 fcport->login_retry = 0;
2168 fcport->port_login_retry_count = ha->port_down_retry_count *
2169 PORT_RETRY_TIME;
2170 atomic_set(&fcport->port_down_timer, ha->port_down_retry_count *
2171 PORT_RETRY_TIME);
2172 fcport->flags &= ~FCF_LOGIN_NEEDED;
2173
2174 qla2x00_iidma_fcport(ha, fcport);
2175
2176 atomic_set(&fcport->state, FCS_ONLINE);
2177
2178 qla2x00_reg_remote_port(ha, fcport);
2179}
2180
2181/*
2182 * qla2x00_configure_fabric 2182 * qla2x00_configure_fabric
2183 * Setup SNS devices with loop ID's. 2183 * Setup SNS devices with loop ID's.
2184 * 2184 *