diff options
Diffstat (limited to 'sys/dev/advansys')
-rw-r--r-- | sys/dev/advansys/advansys.c | 3 | ||||
-rw-r--r-- | sys/dev/advansys/advlib.c | 8 | ||||
-rw-r--r-- | sys/dev/advansys/adwcam.c | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c index c9ccb67..7c21098 100644 --- a/sys/dev/advansys/advansys.c +++ b/sys/dev/advansys/advansys.c @@ -1005,7 +1005,6 @@ adv_run_doneq(struct adv_softc *adv) struct adv_ccb_info *cinfo; u_int done_qaddr; u_int sg_queue_cnt; - int aborted; done_qaddr = ADV_QNO_TO_QADDR(done_qno); @@ -1050,8 +1049,6 @@ adv_run_doneq(struct adv_softc *adv) #endif adv->cur_active -= sg_queue_cnt + 1; - aborted = (scsiq.q_status & QS_ABORTED) != 0; - if ((scsiq.q_status != QS_DONE) && (scsiq.q_status & QS_ABORTED) == 0) panic("adv_qdone: completed scsiq with unknown status"); diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c index dbd0ac4..eb45d1c 100644 --- a/sys/dev/advansys/advlib.c +++ b/sys/dev/advansys/advlib.c @@ -1051,12 +1051,10 @@ adv_isr_chip_halted(struct adv_softc *adv) q_cntl &= ~QC_MSG_OUT; adv_write_lram_8(adv, halt_q_addr + ADV_SCSIQ_B_CNTL, q_cntl); } else if (int_halt_code == ADV_HALT_SS_QUEUE_FULL) { - u_int8_t scsi_status; union ccb *ccb; u_int32_t cinfo_index; - scsi_status = adv_read_lram_8(adv, halt_q_addr - + ADV_SCSIQ_SCSI_STATUS); + adv_read_lram_8(adv, halt_q_addr + ADV_SCSIQ_SCSI_STATUS); cinfo_index = adv_read_lram_32(adv, halt_q_addr + ADV_SCSIQ_D_CINFO_IDX); ccb = adv->ccb_infos[cinfo_index].ccb; @@ -1714,13 +1712,9 @@ adv_send_scsi_queue(struct adv_softc *adv, struct adv_scsi_q *scsiq, { u_int8_t free_q_head; u_int8_t next_qp; - u_int8_t tid_no; - u_int8_t target_ix; int retval; retval = 1; - target_ix = scsiq->q2.target_ix; - tid_no = ADV_TIX_TO_TID(target_ix); free_q_head = adv_read_lram_16(adv, ADVV_FREE_Q_HEAD_W) & 0xFF; if ((next_qp = adv_alloc_free_queues(adv, free_q_head, n_q_required)) != ADV_QLINK_END) { diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c index 875813b..d925045 100644 --- a/sys/dev/advansys/adwcam.c +++ b/sys/dev/advansys/adwcam.c @@ -344,12 +344,10 @@ adw_action(struct cam_sim *sim, union ccb *ccb) case XPT_SCSI_IO: /* Execute the requested I/O operation */ { struct ccb_scsiio *csio; - struct ccb_hdr *ccbh; struct acb *acb; int error; csio = &ccb->csio; - ccbh = &ccb->ccb_h; /* Max supported CDB length is 12 bytes */ if (csio->cdb_len > 12) { |