From 2f10b00f0ab323af0befe8b6887b503520414090 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Mon, 11 Jan 1999 01:58:00 +0000
Subject: panic prints a newline for you, don't do it in the panic string

---
 sys/dev/eisa/ahc_eisa.c | 6 +++---
 sys/dev/isa/isapnp.c    | 4 ++--
 sys/dev/isa/rtfps.c     | 4 ++--
 sys/dev/isa/wdc.c       | 8 ++++----
 sys/dev/isa/wss.c       | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index f447e0c2782..b0cf4bdf72b 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahc_eisa.c,v 1.7 1996/11/28 23:27:37 niklas Exp $	*/
+/*	$OpenBSD: ahc_eisa.c,v 1.8 1999/01/11 01:57:59 millert Exp $	*/
 /*	$NetBSD: ahc_eisa.c,v 1.10 1996/10/21 22:30:58 thorpej Exp $	*/
   
 /*
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.7 1996/11/28 23:27:37 niklas Exp $
+ *	$Id: ahc_eisa.c,v 1.8 1999/01/11 01:57:59 millert Exp $
  */
 
 #if defined(__FreeBSD__)
@@ -370,7 +370,7 @@ ahc_eisa_attach(parent, self, aux)
 		type = AHC_284;
 #endif
 	} else {
-		panic("ahc_eisa_attach: Unknown device type %s\n",
+		panic("ahc_eisa_attach: Unknown device type %s",
 		      ea->ea_idstring);
 	}
 	printf(": %s\n", model);
diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c
index 8a8e0295e6a..e9b8dabaee9 100644
--- a/sys/dev/isa/isapnp.c
+++ b/sys/dev/isa/isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isapnp.c,v 1.22 1998/12/28 09:38:48 deraadt Exp $	*/
+/*	$OpenBSD: isapnp.c,v 1.23 1999/01/11 01:57:53 millert Exp $	*/
 /*	$NetBSD: isapnp.c,v 1.9.4.3 1997/10/29 00:40:43 thorpej Exp $	*/
 
 /*
@@ -871,7 +871,7 @@ isapnp_attach(parent, self, aux)
 	sc->sc_ncards = 0;
 
 	if (isapnp_map(sc))
-		panic("%s: bus map failed\n", sc->sc_dev.dv_xname);
+		panic("%s: bus map failed", sc->sc_dev.dv_xname);
 
 	if (!isapnp_find(sc, 1)) {
 		printf(": no cards found\n", sc->sc_dev.dv_xname);
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index 8ecb5a76c0f..479c8afccd2 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtfps.c,v 1.17 1997/07/07 16:38:22 niklas Exp $       */
+/*	$OpenBSD: rtfps.c,v 1.18 1999/01/11 01:57:52 millert Exp $       */
 /*	$NetBSD: rtfps.c,v 1.27 1996/10/21 22:41:18 thorpej Exp $	*/
 
 /*
@@ -169,7 +169,7 @@ rtfpsattach(parent, self, aux)
 		    COM_NPORTS, 0, &sc->sc_slaveioh[i]))
 			panic("rtfpsattach: couldn't map slave %d", i);
 	if (bus_space_map(iot, sc->sc_irqport, 1, 0, &sc->sc_irqioh))
-		panic("rtfpsattach: couldn't map irq port at 0x%x\n",
+		panic("rtfpsattach: couldn't map irq port at 0x%x",
 		    sc->sc_irqport);
 
 	bus_space_write_1(iot, sc->sc_irqioh, 0, 0);
diff --git a/sys/dev/isa/wdc.c b/sys/dev/isa/wdc.c
index 316263e740a..06b50d7c0e9 100644
--- a/sys/dev/isa/wdc.c
+++ b/sys/dev/isa/wdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc.c,v 1.35 1998/09/15 01:40:08 downsj Exp $	*/
+/*	$OpenBSD: wdc.c,v 1.36 1999/01/11 01:57:52 millert Exp $	*/
 /*	$NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */
 
 /*
@@ -390,7 +390,7 @@ wdcstart(wdc)
 	}
 #ifdef DIAGNOSTIC
 	if ((wdc->sc_flags & WDCF_IRQ_WAIT) != 0)
-		panic("wdcstart: controller waiting for irq\n");
+		panic("wdcstart: controller waiting for irq");
 #endif
 	/*
 	 * XXX
@@ -1895,7 +1895,7 @@ wdc_get_xfer(c_link,flags)
 		splx(s);
 #ifdef DIAGNOSTIC
 		if ((xfer->c_flags & C_INUSE) != 0)
-			panic("wdc_get_xfer: xfer already in use\n");
+			panic("wdc_get_xfer: xfer already in use");
 #endif
 	} else {
 		splx(s);
@@ -1916,7 +1916,7 @@ wdc_get_xfer(c_link,flags)
 	}
 #ifdef DIAGNOSTIC
 	if ((xfer->c_flags & C_INUSE) != 0)
-		panic("wdc_get_xfer: xfer already in use\n");
+		panic("wdc_get_xfer: xfer already in use");
 #endif
 	bzero(xfer, sizeof(struct wdc_xfer));
 	xfer->c_flags = C_INUSE;
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index c49eb337d44..67c3b98e0e5 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wss.c,v 1.18 1999/01/02 00:02:48 niklas Exp $	*/
+/*	$OpenBSD: wss.c,v 1.19 1999/01/11 01:57:53 millert Exp $	*/
 /*	$NetBSD: wss.c,v 1.42 1998/01/19 22:18:23 augustss Exp $	*/
 
 /*
@@ -384,7 +384,7 @@ mad_read(sc, port)
 	pwd = M_PASSWD_931;
 	break;
     default:
-	panic("mad_read: Bad chip type=%d\n", sc->mad_chip_type);
+	panic("mad_read: Bad chip type=%d", sc->mad_chip_type);
     }
     s = splaudio();		/* don't want an interrupt between outb&inb */
     bus_space_write_1(sc->sc_iot, sc->mad_ioh, MC_PASSWD_REG, pwd);
@@ -414,7 +414,7 @@ mad_write(sc, port, value)
 	pwd = M_PASSWD_931;
 	break;
     default:
-	panic("mad_write: Bad chip type=%d\n", sc->mad_chip_type);
+	panic("mad_write: Bad chip type=%d", sc->mad_chip_type);
     }
     s = splaudio();
     bus_space_write_1(sc->sc_iot, sc->mad_ioh, MC_PASSWD_REG, pwd);
-- 
cgit v1.2.3