summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/twa.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c
index 068d2ace406..ee4179b7de2 100644
--- a/sys/dev/pci/twa.c
+++ b/sys/dev/pci/twa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: twa.c,v 1.26 2008/06/24 10:20:41 gmcgarry Exp $ */
+/* $NetBSD: twa.c,v 1.27 2008/06/25 06:22:01 gmcgarry Exp $ */
/* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */
/*-
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.26 2008/06/24 10:20:41 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.27 2008/06/25 06:22:01 gmcgarry Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1021,7 +1021,7 @@ twa_request_bus_scan(struct twa_softc *sc)
}
-#ifdef DIAGNOSTIC
+#ifdef DIAGNOSTIC
static inline void
twa_check_busy_q(struct twa_request *tr)
{
@@ -1131,7 +1131,6 @@ twa_drain_response_queue(struct twa_softc *sc)
return(0); /* no more response queue entries */
rq.u.response_id = twa_inl(sc, TWA_RESPONSE_QUEUE_OFFSET);
}
-
}
/*
@@ -1147,6 +1146,7 @@ twa_drain_response_queue_large(struct twa_softc *sc, uint32_t timeout)
{
uint32_t start_time = 0, end_time;
uint32_t response = 0;
+
if (sc->sc_product_id == PCI_PRODUCT_3WARE_9550 ||
sc->sc_product_id == PCI_PRODUCT_3WARE_9650 ) {
start_time = 0;
@@ -1166,7 +1166,6 @@ twa_drain_response_queue_large(struct twa_softc *sc, uint32_t timeout)
return (0);
}
-
static void
twa_drain_busy_queue(struct twa_softc *sc)
{
@@ -1301,7 +1300,7 @@ out:
}
-#ifdef DIAGNOSTIC
+#ifdef DIAGNOSTIC
static void
twa_check_response_q(struct twa_request *tr, int clear)
{