diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2010-06-02 01:27:21 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2010-06-02 01:27:21 +0000 |
| commit | 9432f16eb35bbe9fa8fac3e7af067cb4551114d7 (patch) | |
| tree | e69dcd23d028acba17bba62086577a0e3b0e7144 /sys/dev/ic | |
| parent | 8d3c36428f70b70b18b17e2fc9da2010826c627e (diff) | |
get rid of useless ccb queues. when the ccb is on the chip, we mark its
state as such, putting it on a queue is silly. one of the queues was
initted by never used.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ciss.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/cissvar.h | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c index 5a9ca724fe3..5b0f8418bad 100644 --- a/sys/dev/ic/ciss.c +++ b/sys/dev/ic/ciss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciss.c,v 1.45 2010/06/02 01:18:36 dlg Exp $ */ +/* $OpenBSD: ciss.c,v 1.46 2010/06/02 01:27:20 dlg Exp $ */ /* * Copyright (c) 2005,2006 Michael Shalayeff @@ -254,8 +254,6 @@ ciss_attach(struct ciss_softc *sc) return -1; } - TAILQ_INIT(&sc->sc_ccbq); - TAILQ_INIT(&sc->sc_ccbdone); TAILQ_INIT(&sc->sc_free_ccb); maxfer = sc->maxsg * PAGE_SIZE; @@ -522,7 +520,6 @@ ciss_cmd(struct ciss_ccb *ccb, int flags, int wait) bus_space_write_4(sc->iot, sc->ioh, CISS_IMR, bus_space_read_4(sc->iot, sc->ioh, CISS_IMR) | sc->iem); - TAILQ_INSERT_TAIL(&sc->sc_ccbq, ccb, ccb_link); ccb->ccb_state = CISS_CCB_ONQ; CISS_DPRINTF(CISS_D_CMD, ("submit=0x%x ", cmd->id)); if (sc->cfg.methods & (CISS_METH_FIFO64|CISS_METH_FIFO64_RRO)) { @@ -647,7 +644,6 @@ ciss_done(struct ciss_ccb *ccb) lock = CISS_LOCK(sc); ccb->ccb_state = CISS_CCB_READY; - TAILQ_REMOVE(&sc->sc_ccbq, ccb, ccb_link); if (ccb->ccb_cmd.id & CISS_CMD_ERR) error = ciss_error(ccb); diff --git a/sys/dev/ic/cissvar.h b/sys/dev/ic/cissvar.h index 05d138d4096..459ee0eeebe 100644 --- a/sys/dev/ic/cissvar.h +++ b/sys/dev/ic/cissvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cissvar.h,v 1.9 2010/06/02 01:18:36 dlg Exp $ */ +/* $OpenBSD: cissvar.h,v 1.10 2010/06/02 01:27:20 dlg Exp $ */ /* * Copyright (c) 2005,2006 Michael Shalayeff @@ -40,7 +40,7 @@ struct ciss_softc { u_int sc_flags; #define CISS_BIO 0x0001 int ccblen, maxcmd, maxsg, nbus, ndrives, maxunits; - ciss_queue_head sc_free_ccb, sc_ccbq, sc_ccbdone; + ciss_queue_head sc_free_ccb; bus_space_tag_t iot; bus_space_handle_t ioh, cfg_ioh; |