summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMasao Uebayashi <uebayasi@cvs.openbsd.org>2015-02-11 01:40:58 +0000
committerMasao Uebayashi <uebayasi@cvs.openbsd.org>2015-02-11 01:40:58 +0000
commitbefc728557bcaafe6e4014c89c46c5b0d484d1cf (patch)
treea477dd8f984424182e46d03373953f7a8efc40b1 /sys
parent77c66ae4bb4df956d397c125a22f664fbb97fd84 (diff)
Fix DIAGNOSTIC build. Trim blank lines.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/octeon/dev/octhci.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/octeon/dev/octhci.c b/sys/arch/octeon/dev/octhci.c
index bc186023041..4ad785ca498 100644
--- a/sys/arch/octeon/dev/octhci.c
+++ b/sys/arch/octeon/dev/octhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: octhci.c,v 1.16 2014/07/13 17:19:17 pirofti Exp $ */
+/* $OpenBSD: octhci.c,v 1.17 2015/02/11 01:40:57 uebayasi Exp $ */
/*
* Copyright (c) 2014 Paul Irofti <pirofti@openbsd.org>
@@ -75,7 +75,6 @@ struct octhci_xfer {
struct usbd_xfer xfer;
};
-
int octhci_match(struct device *, void *, void *);
void octhci_attach(struct device *, struct device *, void *);
@@ -159,7 +158,6 @@ struct usbd_pipe_methods octhci_root_intr_methods = {
.done = octhci_root_intr_done,
};
-
int
octhci_match(struct device *parent, void *match, void *aux)
{
@@ -627,7 +625,7 @@ octhci_allocx(struct usbd_bus *bus)
xx = pool_get(octhcixfer, PR_NOWAIT | PR_ZERO);
#ifdef DIAGNOSTIC
if (xx != NULL)
- xx->xfer.busy_free = XFER_BUSY;
+ xx->xfer.busy_free = XFER_ONQU;
#endif
return ((struct usbd_xfer *)xx);
}
@@ -638,7 +636,7 @@ octhci_freex(struct usbd_bus *bus, struct usbd_xfer *xfer)
struct octhci_xfer *xx = (struct octhci_xfer*)xfer;
#ifdef DIAGNOSTIC
- if (xfer->busy_free != XFER_BUSY) {
+ if (xfer->busy_free != XFER_ONQU) {
printf("%s: xfer=%p not busy, 0x%08x\n", __func__, xfer,
xfer->busy_free);
return;