leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

advansys: Make AscIsrChipHalted() a void function

Browse Source 
AscIsrChipHalted will only ever return '0', so make it
a void function.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
Hannes Reinecke 2015-04-24 13:18:30 +02:00 committed by James Bottomley
parent f1138a84a3
commit 6f0d2e1def
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/scsi/advansys.c
View File

@ -6440,7 +6440,7 @@ static void AscSetChipSDTR(PortAddr iop_base, uchar sdtr_data, uchar tid_no)
AscPutMCodeSDTRDoneAtID(iop_base, tid_no, sdtr_data); AscPutMCodeSDTRDoneAtID(iop_base, tid_no, sdtr_data);
} }
static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc) static void AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)
{ {
EXT_MSG ext_msg; EXT_MSG ext_msg;
EXT_MSG out_msg; EXT_MSG out_msg;
@ -6487,14 +6487,14 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)
boardp->sdtr_data[tid_no] = 0; boardp->sdtr_data[tid_no] = 0;
} }
AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0); AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
return (0); return;
} else if (int_halt_code == ASC_HALT_ENABLE_ASYN_USE_SYN_FIX) { } else if (int_halt_code == ASC_HALT_ENABLE_ASYN_USE_SYN_FIX) {
if (asc_dvc->pci_fix_asyn_xfer & target_id) { if (asc_dvc->pci_fix_asyn_xfer & target_id) {
AscSetChipSDTR(iop_base, asyn_sdtr, tid_no); AscSetChipSDTR(iop_base, asyn_sdtr, tid_no);
boardp->sdtr_data[tid_no] = asyn_sdtr; boardp->sdtr_data[tid_no] = asyn_sdtr;
} }
AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0); AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
return (0); return;
} else if (int_halt_code == ASC_HALT_EXTMSG_IN) { } else if (int_halt_code == ASC_HALT_EXTMSG_IN) {
AscMemWordCopyPtrFromLram(iop_base, AscMemWordCopyPtrFromLram(iop_base,
ASCV_MSGIN_BEG, ASCV_MSGIN_BEG,
@ -6580,7 +6580,7 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)
(ushort)ASC_SCSIQ_B_CNTL), (ushort)ASC_SCSIQ_B_CNTL),
q_cntl); q_cntl);
AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0); AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
return (0); return;
} else if (ext_msg.msg_type == EXTENDED_MESSAGE && } else if (ext_msg.msg_type == EXTENDED_MESSAGE &&
ext_msg.msg_req == EXTENDED_WDTR && ext_msg.msg_req == EXTENDED_WDTR &&
ext_msg.msg_len == MS_WDTR_LEN) { ext_msg.msg_len == MS_WDTR_LEN) {
@ -6596,7 +6596,7 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)
(ushort)ASC_SCSIQ_B_CNTL), (ushort)ASC_SCSIQ_B_CNTL),
q_cntl); q_cntl);
AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0); AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
return (0); return;
} else { } else {
ext_msg.msg_type = MESSAGE_REJECT; ext_msg.msg_type = MESSAGE_REJECT;
@ -6610,7 +6610,7 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)
(ushort)ASC_SCSIQ_B_CNTL), (ushort)ASC_SCSIQ_B_CNTL),
q_cntl); q_cntl);
AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0); AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
return (0); return;
} }
} else if (int_halt_code == ASC_HALT_CHK_CONDITION) { } else if (int_halt_code == ASC_HALT_CHK_CONDITION) {
@ -6667,7 +6667,7 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)
AscWriteLramByte(iop_base, (ushort)ASCV_SCSIBUSY_B, scsi_busy); AscWriteLramByte(iop_base, (ushort)ASCV_SCSIBUSY_B, scsi_busy);
AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0); AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
return (0); return;
} else if (int_halt_code == ASC_HALT_SDTR_REJECTED) { } else if (int_halt_code == ASC_HALT_SDTR_REJECTED) {
AscMemWordCopyPtrFromLram(iop_base, AscMemWordCopyPtrFromLram(iop_base,
@ -6689,7 +6689,7 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)
(ushort)(halt_q_addr + (ushort)(halt_q_addr +
(ushort)ASC_SCSIQ_B_CNTL), q_cntl); (ushort)ASC_SCSIQ_B_CNTL), q_cntl);
AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0); AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
return (0); return;
} else if (int_halt_code == ASC_HALT_SS_QUEUE_FULL) { } else if (int_halt_code == ASC_HALT_SS_QUEUE_FULL) {
scsi_status = AscReadLramByte(iop_base, scsi_status = AscReadLramByte(iop_base,
@ -6734,7 +6734,7 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)
} }
} }
AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0); AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
return (0); return;
} }
#if CC_VERY_LONG_SG_LIST #if CC_VERY_LONG_SG_LIST
else if (int_halt_code == ASC_HALT_HOST_COPY_SG_LIST_TO_RISC) { else if (int_halt_code == ASC_HALT_HOST_COPY_SG_LIST_TO_RISC) {
@ -6890,10 +6890,10 @@ static int AscIsrChipHalted(ASC_DVC_VAR *asc_dvc)
* after the return. * after the return.
*/ */
AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0); AscWriteLramWord(iop_base, ASCV_HALTCODE_W, 0);
return (0); return;
} }
#endif /* CC_VERY_LONG_SG_LIST */ #endif /* CC_VERY_LONG_SG_LIST */
return (0); return;
} }
/* /*
@ -7306,13 +7306,9 @@ static int AscISR(ASC_DVC_VAR *asc_dvc)
AscAckInterrupt(iop_base); AscAckInterrupt(iop_base);
int_pending = ASC_TRUE; int_pending = ASC_TRUE;
if ((chipstat & CSW_HALTED) && (ctrl_reg & CC_SINGLE_STEP)) { if ((chipstat & CSW_HALTED) && (ctrl_reg & CC_SINGLE_STEP)) {
if (AscIsrChipHalted(asc_dvc) == ASC_ERROR) { AscIsrChipHalted(asc_dvc);
goto ISR_REPORT_QDONE_FATAL_ERROR; saved_ctrl_reg &= (uchar)(~CC_HALT);
} else {
saved_ctrl_reg &= (uchar)(~CC_HALT);
}
} else { } else {
ISR_REPORT_QDONE_FATAL_ERROR:
if ((asc_dvc->dvc_cntl & ASC_CNTL_INT_MULTI_Q) != 0) { if ((asc_dvc->dvc_cntl & ASC_CNTL_INT_MULTI_Q) != 0) {
while (((status = while (((status =
AscIsrQDone(asc_dvc)) & 0x01) != 0) { AscIsrQDone(asc_dvc)) & 0x01) != 0) {