diff options
author | Vikas Chaudhary <vikas.chaudhary@qlogic.com> | 2012-08-22 07:55:01 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-24 04:11:06 -0400 |
commit | 5e9bcec792419d335555784a1b99d4331030d18e (patch) | |
tree | e7ccad8d071eadb651108314f67a2cdfdc8b6112 | |
parent | 7664a1fd76d2eb49b07443f5fc46c75f6a95c98b (diff) |
[SCSI] qla4xxx: Update func name from ql4_ to qla4_
ql4_8xxx_mark_entry_skipped to qla4_8xxx_mark_entry_skipped
ql4_attr_is_visible to qla4_attr_is_visible
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_nx.c | 12 | ||||
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c index fa34e20b7d8a..7764c3ff02fc 100644 --- a/drivers/scsi/qla4xxx/ql4_nx.c +++ b/drivers/scsi/qla4xxx/ql4_nx.c | |||
@@ -2077,7 +2077,7 @@ static int qla4_8xxx_minidump_process_rdmem(struct scsi_qla_host *ha, | |||
2077 | return QLA_SUCCESS; | 2077 | return QLA_SUCCESS; |
2078 | } | 2078 | } |
2079 | 2079 | ||
2080 | static void ql4_8xxx_mark_entry_skipped(struct scsi_qla_host *ha, | 2080 | static void qla4_8xxx_mark_entry_skipped(struct scsi_qla_host *ha, |
2081 | struct qla8xxx_minidump_entry_hdr *entry_hdr, | 2081 | struct qla8xxx_minidump_entry_hdr *entry_hdr, |
2082 | int index) | 2082 | int index) |
2083 | { | 2083 | { |
@@ -2161,13 +2161,13 @@ static int qla4_8xxx_collect_md_data(struct scsi_qla_host *ha) | |||
2161 | */ | 2161 | */ |
2162 | switch (entry_hdr->entry_type) { | 2162 | switch (entry_hdr->entry_type) { |
2163 | case QLA82XX_RDEND: | 2163 | case QLA82XX_RDEND: |
2164 | ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i); | 2164 | qla4_8xxx_mark_entry_skipped(ha, entry_hdr, i); |
2165 | break; | 2165 | break; |
2166 | case QLA82XX_CNTRL: | 2166 | case QLA82XX_CNTRL: |
2167 | rval = qla4_8xxx_minidump_process_control(ha, | 2167 | rval = qla4_8xxx_minidump_process_control(ha, |
2168 | entry_hdr); | 2168 | entry_hdr); |
2169 | if (rval != QLA_SUCCESS) { | 2169 | if (rval != QLA_SUCCESS) { |
2170 | ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i); | 2170 | qla4_8xxx_mark_entry_skipped(ha, entry_hdr, i); |
2171 | goto md_failed; | 2171 | goto md_failed; |
2172 | } | 2172 | } |
2173 | break; | 2173 | break; |
@@ -2179,7 +2179,7 @@ static int qla4_8xxx_collect_md_data(struct scsi_qla_host *ha) | |||
2179 | rval = qla4_8xxx_minidump_process_rdmem(ha, entry_hdr, | 2179 | rval = qla4_8xxx_minidump_process_rdmem(ha, entry_hdr, |
2180 | &data_ptr); | 2180 | &data_ptr); |
2181 | if (rval != QLA_SUCCESS) { | 2181 | if (rval != QLA_SUCCESS) { |
2182 | ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i); | 2182 | qla4_8xxx_mark_entry_skipped(ha, entry_hdr, i); |
2183 | goto md_failed; | 2183 | goto md_failed; |
2184 | } | 2184 | } |
2185 | break; | 2185 | break; |
@@ -2195,7 +2195,7 @@ static int qla4_8xxx_collect_md_data(struct scsi_qla_host *ha) | |||
2195 | rval = qla4_8xxx_minidump_process_l2tag(ha, entry_hdr, | 2195 | rval = qla4_8xxx_minidump_process_l2tag(ha, entry_hdr, |
2196 | &data_ptr); | 2196 | &data_ptr); |
2197 | if (rval != QLA_SUCCESS) { | 2197 | if (rval != QLA_SUCCESS) { |
2198 | ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i); | 2198 | qla4_8xxx_mark_entry_skipped(ha, entry_hdr, i); |
2199 | goto md_failed; | 2199 | goto md_failed; |
2200 | } | 2200 | } |
2201 | break; | 2201 | break; |
@@ -2218,7 +2218,7 @@ static int qla4_8xxx_collect_md_data(struct scsi_qla_host *ha) | |||
2218 | break; | 2218 | break; |
2219 | case QLA82XX_RDNOP: | 2219 | case QLA82XX_RDNOP: |
2220 | default: | 2220 | default: |
2221 | ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i); | 2221 | qla4_8xxx_mark_entry_skipped(ha, entry_hdr, i); |
2222 | break; | 2222 | break; |
2223 | } | 2223 | } |
2224 | 2224 | ||
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index a3a26e47b800..89c2576ea828 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -160,7 +160,7 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd); | |||
160 | static int qla4xxx_slave_alloc(struct scsi_device *device); | 160 | static int qla4xxx_slave_alloc(struct scsi_device *device); |
161 | static int qla4xxx_slave_configure(struct scsi_device *device); | 161 | static int qla4xxx_slave_configure(struct scsi_device *device); |
162 | static void qla4xxx_slave_destroy(struct scsi_device *sdev); | 162 | static void qla4xxx_slave_destroy(struct scsi_device *sdev); |
163 | static umode_t ql4_attr_is_visible(int param_type, int param); | 163 | static umode_t qla4_attr_is_visible(int param_type, int param); |
164 | static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type); | 164 | static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type); |
165 | static int qla4xxx_change_queue_depth(struct scsi_device *sdev, int qdepth, | 165 | static int qla4xxx_change_queue_depth(struct scsi_device *sdev, int qdepth, |
166 | int reason); | 166 | int reason); |
@@ -203,7 +203,7 @@ static struct iscsi_transport qla4xxx_iscsi_transport = { | |||
203 | CAP_DATA_PATH_OFFLOAD | CAP_HDRDGST | | 203 | CAP_DATA_PATH_OFFLOAD | CAP_HDRDGST | |
204 | CAP_DATADGST | CAP_LOGIN_OFFLOAD | | 204 | CAP_DATADGST | CAP_LOGIN_OFFLOAD | |
205 | CAP_MULTI_R2T, | 205 | CAP_MULTI_R2T, |
206 | .attr_is_visible = ql4_attr_is_visible, | 206 | .attr_is_visible = qla4_attr_is_visible, |
207 | .create_session = qla4xxx_session_create, | 207 | .create_session = qla4xxx_session_create, |
208 | .destroy_session = qla4xxx_session_destroy, | 208 | .destroy_session = qla4xxx_session_destroy, |
209 | .start_conn = qla4xxx_conn_start, | 209 | .start_conn = qla4xxx_conn_start, |
@@ -315,7 +315,7 @@ exit_send_ping: | |||
315 | return rval; | 315 | return rval; |
316 | } | 316 | } |
317 | 317 | ||
318 | static umode_t ql4_attr_is_visible(int param_type, int param) | 318 | static umode_t qla4_attr_is_visible(int param_type, int param) |
319 | { | 319 | { |
320 | switch (param_type) { | 320 | switch (param_type) { |
321 | case ISCSI_HOST_PARAM: | 321 | case ISCSI_HOST_PARAM: |