[src/trunk]: src/sys/dev/ic remove write-only sc_ccbq, and unused sc_ccbdone

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/042a51bb4f0c
branches:  trunk
changeset: 935847:042a51bb4f0c
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Fri Jul 10 14:23:56 2020 +0000

description:
remove write-only sc_ccbq, and unused sc_ccbdone

diffstat:

 sys/dev/ic/ciss.c    |  12 ++----------
 sys/dev/ic/cissvar.h |   4 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diffs (65 lines):

diff -r 49adce8e6b9f -r 042a51bb4f0c sys/dev/ic/ciss.c
--- a/sys/dev/ic/ciss.c Fri Jul 10 12:45:15 2020 +0000
+++ b/sys/dev/ic/ciss.c Fri Jul 10 14:23:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ciss.c,v 1.42 2020/05/15 19:28:10 maxv Exp $   */
+/*     $NetBSD: ciss.c,v 1.43 2020/07/10 14:23:56 jdolecek Exp $       */
 /*     $OpenBSD: ciss.c,v 1.68 2013/05/30 16:15:02 deraadt Exp $       */
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.42 2020/05/15 19:28:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.43 2020/07/10 14:23:56 jdolecek Exp $");
 
 #include "bio.h"
 
@@ -247,8 +247,6 @@
                return -1;
        }
 
-       TAILQ_INIT(&sc->sc_ccbq);
-       TAILQ_INIT(&sc->sc_ccbdone);
        TAILQ_INIT(&sc->sc_free_ccb);
 
        maxfer = sc->maxsg * PAGE_SIZE;
@@ -594,9 +592,6 @@
                    bus_space_read_4(sc->sc_iot, sc->sc_ioh, CISS_IMR) | sc->iem);
 #endif
 
-       mutex_enter(&sc->sc_mutex);
-       TAILQ_INSERT_TAIL(&sc->sc_ccbq, ccb, ccb_link);
-       mutex_exit(&sc->sc_mutex);
        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)) {
@@ -660,9 +655,6 @@
        }
 
        ccb->ccb_state = CISS_CCB_READY;
-       mutex_enter(&sc->sc_mutex);
-       TAILQ_REMOVE(&sc->sc_ccbq, ccb, ccb_link);
-       mutex_exit(&sc->sc_mutex);
 
        if (ccb->ccb_cmd.id & CISS_CMD_ERR)
                error = ciss_error(ccb);
diff -r 49adce8e6b9f -r 042a51bb4f0c sys/dev/ic/cissvar.h
--- a/sys/dev/ic/cissvar.h      Fri Jul 10 12:45:15 2020 +0000
+++ b/sys/dev/ic/cissvar.h      Fri Jul 10 14:23:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cissvar.h,v 1.7 2018/02/12 23:11:00 joerg Exp $        */
+/*     $NetBSD: cissvar.h,v 1.8 2020/07/10 14:24:14 jdolecek Exp $     */
 /*     $OpenBSD: cissvar.h,v 1.15 2013/05/30 16:15:02 deraadt Exp $    */
 
 /*
@@ -57,7 +57,7 @@
 
        u_int   sc_flags;
        int ccblen, maxcmd, maxsg, nbus, ndrives, maxunits;
-       ciss_queue_head sc_free_ccb, sc_ccbq, sc_ccbdone;
+       ciss_queue_head         sc_free_ccb;
        kcondvar_t              sc_condvar;
 
        bus_dmamap_t            cmdmap;