aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_isr.c
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2005-07-06 13:32:07 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-07-14 11:03:15 -0400
commitfa2a1ce53d4b869b74da9a770770c79f9af64914 (patch)
treeda350e79117d3177f51c2788c51aeba425afd4ca /drivers/scsi/qla2xxx/qla_isr.c
parentba5140b48e35aa4e4b57eb6db5cface63d7bd712 (diff)
[SCSI] qla2xxx: Code scrubbing.
Code scrubbing. - Remove trailing whitespace from driver files. - Remove unused #defines and inlines. - Standardize on C comments (// -> /* */) Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_isr.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index b960bdfe91e9..f6d94bea37f2 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -240,13 +240,13 @@ qla2x00_mbx_completion(scsi_qla_host_t *ha, uint16_t mb0)
240 wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 1); 240 wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 1);
241 241
242 for (cnt = 1; cnt < ha->mbx_count; cnt++) { 242 for (cnt = 1; cnt < ha->mbx_count; cnt++) {
243 if (IS_QLA2200(ha) && cnt == 8) 243 if (IS_QLA2200(ha) && cnt == 8)
244 wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 8); 244 wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 8);
245 if (cnt == 4 || cnt == 5) 245 if (cnt == 4 || cnt == 5)
246 ha->mailbox_out[cnt] = qla2x00_debounce_register(wptr); 246 ha->mailbox_out[cnt] = qla2x00_debounce_register(wptr);
247 else 247 else
248 ha->mailbox_out[cnt] = RD_REG_WORD(wptr); 248 ha->mailbox_out[cnt] = RD_REG_WORD(wptr);
249 249
250 wptr++; 250 wptr++;
251 } 251 }
252 252
@@ -514,7 +514,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
514 "Configuration change detected: value=%x.\n", mb[1]); 514 "Configuration change detected: value=%x.\n", mb[1]);
515 515
516 if (atomic_read(&ha->loop_state) != LOOP_DOWN) { 516 if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
517 atomic_set(&ha->loop_state, LOOP_DOWN); 517 atomic_set(&ha->loop_state, LOOP_DOWN);
518 if (!atomic_read(&ha->loop_down_timer)) 518 if (!atomic_read(&ha->loop_down_timer))
519 atomic_set(&ha->loop_down_timer, 519 atomic_set(&ha->loop_down_timer,
520 LOOP_DOWN_TIME); 520 LOOP_DOWN_TIME);
@@ -846,7 +846,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
846 qla_printk(KERN_WARNING, ha, "Status Entry invalid handle.\n"); 846 qla_printk(KERN_WARNING, ha, "Status Entry invalid handle.\n");
847 847
848 set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); 848 set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
849 if (ha->dpc_wait && !ha->dpc_active) 849 if (ha->dpc_wait && !ha->dpc_active)
850 up(ha->dpc_wait); 850 up(ha->dpc_wait);
851 851
852 return; 852 return;
@@ -969,7 +969,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
969 } 969 }
970 970
971 /* 971 /*
972 * Check to see if SCSI Status is non zero. If so report SCSI 972 * Check to see if SCSI Status is non zero. If so report SCSI
973 * Status. 973 * Status.
974 */ 974 */
975 if (lscsi_status != 0) { 975 if (lscsi_status != 0) {
@@ -991,7 +991,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
991 sp->request_sense_length = sense_len; 991 sp->request_sense_length = sense_len;
992 sp->request_sense_ptr = cp->sense_buffer; 992 sp->request_sense_ptr = cp->sense_buffer;
993 993
994 if (sp->request_sense_length > 32) 994 if (sp->request_sense_length > 32)
995 sense_len = 32; 995 sense_len = 32;
996 996
997 memcpy(cp->sense_buffer, sense_data, sense_len); 997 memcpy(cp->sense_buffer, sense_data, sense_len);
@@ -1096,7 +1096,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
1096 break; 1096 break;
1097 1097
1098 case CS_ABORTED: 1098 case CS_ABORTED:
1099 /* 1099 /*
1100 * hv2.19.12 - DID_ABORT does not retry the request if we 1100 * hv2.19.12 - DID_ABORT does not retry the request if we
1101 * aborted this request then abort otherwise it must be a 1101 * aborted this request then abort otherwise it must be a
1102 * reset. 1102 * reset.
@@ -1137,7 +1137,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
1137 1137
1138 /* SCSI Mid-Layer handles device queue full */ 1138 /* SCSI Mid-Layer handles device queue full */
1139 1139
1140 cp->result = DID_OK << 16 | lscsi_status; 1140 cp->result = DID_OK << 16 | lscsi_status;
1141 1141
1142 break; 1142 break;
1143 1143
@@ -1178,7 +1178,7 @@ qla2x00_status_cont_entry(scsi_qla_host_t *ha, sts_cont_entry_t *pkt)
1178 "sp=%p sp->state:%d\n", __func__, sp, sp->state)); 1178 "sp=%p sp->state:%d\n", __func__, sp, sp->state));
1179 qla_printk(KERN_INFO, ha, 1179 qla_printk(KERN_INFO, ha,
1180 "cmd is NULL: already returned to OS (sp=%p)\n", 1180 "cmd is NULL: already returned to OS (sp=%p)\n",
1181 sp); 1181 sp);
1182 1182
1183 ha->status_srb = NULL; 1183 ha->status_srb = NULL;
1184 return; 1184 return;
@@ -1223,7 +1223,7 @@ qla2x00_error_entry(scsi_qla_host_t *ha, sts_entry_t *pkt)
1223 else if (pkt->entry_status & RF_INV_E_COUNT) 1223 else if (pkt->entry_status & RF_INV_E_COUNT)
1224 qla_printk(KERN_ERR, ha, "%s: Invalid Entry Count\n", __func__); 1224 qla_printk(KERN_ERR, ha, "%s: Invalid Entry Count\n", __func__);
1225 else if (pkt->entry_status & RF_INV_E_PARAM) 1225 else if (pkt->entry_status & RF_INV_E_PARAM)
1226 qla_printk(KERN_ERR, ha, 1226 qla_printk(KERN_ERR, ha,
1227 "%s: Invalid Entry Parameter\n", __func__); 1227 "%s: Invalid Entry Parameter\n", __func__);
1228 else if (pkt->entry_status & RF_INV_E_TYPE) 1228 else if (pkt->entry_status & RF_INV_E_TYPE)
1229 qla_printk(KERN_ERR, ha, "%s: Invalid Entry Type\n", __func__); 1229 qla_printk(KERN_ERR, ha, "%s: Invalid Entry Type\n", __func__);
@@ -1365,7 +1365,6 @@ qla24xx_process_response_queue(struct scsi_qla_host *ha)
1365 DEBUG3(printk(KERN_INFO 1365 DEBUG3(printk(KERN_INFO
1366 "scsi(%ld): Process error entry.\n", ha->host_no)); 1366 "scsi(%ld): Process error entry.\n", ha->host_no));
1367 1367
1368 //FIXME
1369 qla2x00_error_entry(ha, (sts_entry_t *) pkt); 1368 qla2x00_error_entry(ha, (sts_entry_t *) pkt);
1370 ((response_t *)pkt)->signature = RESPONSE_PROCESSED; 1369 ((response_t *)pkt)->signature = RESPONSE_PROCESSED;
1371 wmb(); 1370 wmb();