summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2010-06-03 00:56:43 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2010-06-03 00:56:43 +0000
commit73ce14335350be66c1902ddb76958ab8e46963d4 (patch)
treec0661f7509a313f6d628a0c98af4b29b70c0cbea
parent037159200032c37e75454ae922a390b8c81f1eee (diff)
useless abstraction is, by definition, useless.
dont typedef the tailq head struct.
-rw-r--r--sys/dev/ic/ciss.c4
-rw-r--r--sys/dev/ic/cissvar.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 013a94c2f8a..fadc2202044 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciss.c,v 1.51 2010/06/02 13:34:21 dlg Exp $ */
+/* $OpenBSD: ciss.c,v 1.52 2010/06/03 00:56:42 dlg Exp $ */
/*
* Copyright (c) 2005,2006 Michael Shalayeff
@@ -114,7 +114,7 @@ ciss_get_ccb(void *xsc)
struct ciss_ccb *ccb;
mtx_enter(&sc->sc_free_ccb_mtx);
- if ((ccb = TAILQ_LAST(&sc->sc_free_ccb, ciss_queue_head))) {
+ if ((ccb = TAILQ_LAST(&sc->sc_free_ccb, ciss_ccb_list))) {
TAILQ_REMOVE(&sc->sc_free_ccb, ccb, ccb_link);
ccb->ccb_state = CISS_CCB_READY;
ccb->ccb_xs = NULL;
diff --git a/sys/dev/ic/cissvar.h b/sys/dev/ic/cissvar.h
index abb476739ab..97f245439ca 100644
--- a/sys/dev/ic/cissvar.h
+++ b/sys/dev/ic/cissvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cissvar.h,v 1.12 2010/06/02 13:34:21 dlg Exp $ */
+/* $OpenBSD: cissvar.h,v 1.13 2010/06/03 00:56:42 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;
+ struct ciss_ccb_list sc_free_ccb;
struct mutex sc_free_ccb_mtx;
struct scsi_iopool sc_iopool;