From 2a674c0321ab1d6c4d86181028fa51dc3dda5e31 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org>
Date: Sat, 29 Aug 2009 13:58:52 +0000
Subject: remove more unneeded Debugger() calls from dev/

agreed by deraadt@
ok jsing@
---
 sys/dev/ic/adv.c | 10 ++--------
 sys/dev/ic/adw.c |  9 ++-------
 sys/dev/ic/bha.c | 18 +++++-------------
 sys/dev/ic/uha.c |  9 ++-------
 4 files changed, 11 insertions(+), 35 deletions(-)

(limited to 'sys/dev/ic')

diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index c8659877da8..394d75e4191 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adv.c,v 1.24 2009/02/16 21:19:06 miod Exp $	*/
+/*	$OpenBSD: adv.c,v 1.25 2009/08/29 13:58:51 jasper Exp $	*/
 /*	$NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $	*/
 
 /*
@@ -52,11 +52,6 @@
 #include <dev/ic/adv.h>
 #include <dev/ic/advlib.h>
 
-#ifndef DDB
-#define	Debugger()	panic("should call debugger here (adv.c)")
-#endif /* ! DDB */
-
-
 /* #define ASC_DEBUG */
 
 /******************************************************************************/
@@ -866,8 +861,7 @@ adv_narrow_isr_callback(sc, qdonep)
 		bus_dmamap_unload(dmat, ccb->dmamap_xfer);
 	}
 	if ((ccb->flags & CCB_ALLOC) == 0) {
-		printf("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
-		Debugger();
+		panic("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
 		return;
 	}
 	/*
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 14a429db7b8..f90c3ac6aba 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adw.c,v 1.38 2009/02/16 21:19:06 miod Exp $ */
+/*	$OpenBSD: adw.c,v 1.39 2009/08/29 13:58:51 jasper Exp $ */
 /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $	 */
 
 /*
@@ -54,10 +54,6 @@
 #include <dev/microcode/adw/adwmcode.h>
 #include <dev/ic/adw.h>
 
-#ifndef DDB
-#define	Debugger()	panic("should call debugger here (adw.c)")
-#endif				/* ! DDB */
-
 /******************************************************************************/
 
 
@@ -1058,9 +1054,8 @@ adw_isr_callback(sc, scsiq)
 	TAILQ_REMOVE(&sc->sc_pending_ccb, ccb, chain);
 
 	if ((ccb->flags & CCB_ALLOC) == 0) {
-		printf("%s: unallocated ccb found on pending list!\n",
+		panic("%s: unallocated ccb found on pending list!\n",
 		    sc->sc_dev.dv_xname);
-		Debugger();
 		adw_free_ccb(sc, ccb);
 		return;
 	}
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index 64f2428ca18..c90acf743e5 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bha.c,v 1.17 2009/02/16 21:19:06 miod Exp $	*/
+/*	$OpenBSD: bha.c,v 1.18 2009/08/29 13:58:51 jasper Exp $	*/
 /*	$NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $	*/
 
 #undef BHADEBUG
@@ -74,10 +74,6 @@
 #include <dev/ic/bhareg.h>
 #include <dev/ic/bhavar.h>
 
-#ifndef DDB
-#define Debugger() panic("should call debugger here (bha.c)")
-#endif /* ! DDB */
-
 #define	BHA_MAXXFER	((BHA_NSEG - 1) << PGSHIFT)
 #define	ISWIDE(sc)	((sc)->sc_iswide)
 
@@ -754,16 +750,14 @@ bha_done(sc, ccb)
 	 */
 #ifdef BHADIAG
 	if (ccb->flags & CCB_SENDING) {
-		printf("%s: exiting ccb still in transit!\n",
+		panic("%s: exiting ccb still in transit!\n",
 		    sc->sc_dev.dv_xname);
-		Debugger();
 		return;
 	}
 #endif
 	if ((ccb->flags & CCB_ALLOC) == 0) {
-		printf("%s: exiting ccb not allocated!\n",
+		panic("%s: exiting ccb not allocated!\n",
 		    sc->sc_dev.dv_xname);
-		Debugger();
 		return;
 	}
 	if (xs->error == XS_NOERROR) {
@@ -1468,10 +1462,8 @@ bha_timeout(arg)
 	 * If the ccb's mbx is not free, then the board has gone Far East?
 	 */
 	bha_collect_mbo(sc);
-	if (ccb->flags & CCB_SENDING) {
-		printf("%s: not taking commands!\n", sc->sc_dev.dv_xname);
-		Debugger();
-	}
+	if (ccb->flags & CCB_SENDING)
+		panic("%s: not taking commands!\n", sc->sc_dev.dv_xname);
 #endif
 
 	/*
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 1cbad497019..dc966d7de58 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha.c,v 1.12 2009/02/16 21:19:07 miod Exp $	*/
+/*	$OpenBSD: uha.c,v 1.13 2009/08/29 13:58:51 jasper Exp $	*/
 /*	$NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $	*/
 
 #undef UHADEBUG
@@ -80,10 +80,6 @@
 #include <dev/ic/uhareg.h>
 #include <dev/ic/uhavar.h>
 
-#ifndef	DDB
-#define Debugger() panic("should call debugger here (ultra14f.c)")
-#endif /* ! DDB */
-
 #define KVTOPHYS(x)	vtophys((vaddr_t)x)
 
 integrate void uha_reset_mscp(struct uha_softc *, struct uha_mscp *);
@@ -299,8 +295,7 @@ uha_done(sc, mscp)
 	 * into the xfer and call whoever started it
 	 */
 	if ((mscp->flags & MSCP_ALLOC) == 0) {
-		printf("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
-		Debugger();
+		panic("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
 		return;
 	}
 	if (xs->error == XS_NOERROR) {
-- 
cgit v1.2.3