diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 3cfeb90e9f06..74baf164b860 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -272,7 +272,6 @@ TUNABLE_INT("hw.ciss.force_transport", &ciss_force_transport); static int ciss_force_interrupt = 0; TUNABLE_INT("hw.ciss.force_interrupt", &ciss_force_interrupt); - /************************************************************************ * CISS adapters amazingly don't have a defined programming interface * value. (One could say some very despairing things about PCI and @@ -1457,7 +1456,6 @@ ciss_init_logical(struct ciss_softc *sc) sc->ciss_logical[i][j].cl_status = CISS_LD_NONEXISTENT; } - for (i = 0; i < sc->ciss_cfg->max_logical_supported; i++) { if (i < ndrives) { struct ciss_ldrive *ld; @@ -1476,7 +1474,6 @@ ciss_init_logical(struct ciss_softc *sc) */ if (ld->cl_lstatus->media_exchanged) ciss_accept_media(sc, ld); - } } @@ -2127,7 +2124,6 @@ ciss_done(struct ciss_softc *sc, cr_qhead_t *qh) * to the completed queue. */ for (;;) { - tag = CISS_TL_SIMPLE_FETCH_CMD(sc); if (tag == CISS_TL_SIMPLE_OPQ_EMPTY) break; @@ -2229,7 +2225,6 @@ ciss_perf_msi_intr(void *arg) mtx_unlock(&sc->ciss_mtx); } - /************************************************************************ * Process completed requests. * @@ -2482,7 +2477,6 @@ ciss_abort_request(struct ciss_request *ar) } #endif - /************************************************************************ * Fetch and initialise a request */ @@ -2983,7 +2977,6 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb) physical = CISS_IS_PHYSICAL(bus); switch (ccb->ccb_h.func_code) { - /* perform SCSI I/O */ case XPT_SCSI_IO: if (!ciss_cam_action_io(sim, csio)) @@ -3399,7 +3392,6 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio) (cdb[1] & SI_EVPD) == 0 && (csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN && csio->dxfer_len >= SHORT_INQUIRY_LENGTH) { - inq = (struct scsi_inquiry_data *)csio->data_ptr; target = csio->ccb_h.target_id; bus = cam_sim_bus(xpt_path_sim(csio->ccb_h.path)); @@ -3430,7 +3422,6 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio) } } - /******************************************************************************** * Name the device at (target) * @@ -4205,7 +4196,6 @@ ciss_notify_thread(void *arg) } ciss_release_request(cr); - } sc->ciss_notify_thread = NULL; wakeup(&sc->ciss_notify_thread); @@ -4479,7 +4469,6 @@ ciss_decode_ldrive_status(int status) } } - /************************************************************************ * Return a name for a logical drive's organisation. */ diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h index 56d19d104542..e6c848cfa72a 100644 --- a/sys/dev/ciss/cissreg.h +++ b/sys/dev/ciss/cissreg.h @@ -855,6 +855,4 @@ struct ciss_bmic_flush_cache { CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, \ CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR) & ~(sc)->ciss_interrupt_mask) - - #endif /* _KERNEL */ diff --git a/sys/dev/ciss/cissvar.h b/sys/dev/ciss/cissvar.h index 1412ababcd53..b3a4155b8930 100644 --- a/sys/dev/ciss/cissvar.h +++ b/sys/dev/ciss/cissvar.h @@ -315,7 +315,6 @@ struct ciss_softc sc->ciss_qstat[qname].q_max = 0; \ } while(0) - #define CISSQ_REQUEST_QUEUE(name, index) \ static __inline void \ ciss_initq_ ## name (struct ciss_softc *sc) \