summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2010-08-07 03:50:03 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2010-08-07 03:50:03 +0000
commiteb95cc9da073c2c7f556ff2c8c2a63c319881bfb (patch)
treed3984d88de35cd21a0754c75a71b124b3e0c79f2 /sys/dev/ic
parent327b342b96e585a8d91a4811578b95328b8aead2 (diff)
No "\n" needed at the end of panic() strings.
Bogus chunks pointed out by matthew@ and miod@. No cookies for marco@ and jasper@. ok deraadt@ miod@ matthew@ jasper@ macro@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/aac.c10
-rw-r--r--sys/dev/ic/acx.c4
-rw-r--r--sys/dev/ic/adv.c4
-rw-r--r--sys/dev/ic/adw.c4
-rw-r--r--sys/dev/ic/bha.c8
-rw-r--r--sys/dev/ic/bwi.c22
-rw-r--r--sys/dev/ic/mpi.c8
-rw-r--r--sys/dev/ic/pgt.c4
-rw-r--r--sys/dev/ic/re.c6
-rw-r--r--sys/dev/ic/uha.c4
10 files changed, 37 insertions, 37 deletions
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 7bab303cc4e..93d19b55a15 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aac.c,v 1.47 2010/06/28 18:31:01 krw Exp $ */
+/* $OpenBSD: aac.c,v 1.48 2010/08/07 03:50:01 krw Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@@ -423,7 +423,7 @@ aac_add_container(struct aac_softc *sc, struct aac_mntinforesp *mir, int f)
co = (struct aac_container *)malloc(sizeof *co, M_DEVBUF,
M_NOWAIT);
if (co == NULL)
- panic("Out of memory?!\n");
+ panic("Out of memory?!");
bzero(co, sizeof *co);
AAC_DPRINTF(AAC_D_MISC,
("%s: id %x name '%.16s' size %u type %d\n",
@@ -547,7 +547,7 @@ aac_detach(device_t dev)
}
if (sc->aifflags & AAC_AIFFLAGS_RUNNING)
- panic("Cannot shutdown AIF thread\n");
+ panic("Cannot shutdown AIF thread");
if ((error = aac_shutdown(dev)))
return(error);
@@ -769,7 +769,7 @@ aac_startio(struct aac_softc *sc)
* catastrophic since it means that bus_dmamap_load() failed.
*/
if (aac_map_command(cm) != 0)
- panic("aac: error mapping command %p\n", cm);
+ panic("aac: error mapping command %p", cm);
AAC_DPRINTF(AAC_D_CMD, ("\n%s: another command",
sc->aac_dev.dv_xname));
@@ -1006,7 +1006,7 @@ aac_bio_command(struct aac_softc *sc, struct aac_command **cmp)
opcode = WRITE_COMMAND;
break;
default:
- panic("%s: invalid opcode %#x\n", sc->aac_dev.dv_xname,
+ panic("%s: invalid opcode %#x", sc->aac_dev.dv_xname,
xs->cmd->opcode);
}
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 2f9fe36b098..cba71b01ec1 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx.c,v 1.95 2009/09/13 14:42:52 krw Exp $ */
+/* $OpenBSD: acx.c,v 1.96 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -2197,7 +2197,7 @@ acx_encap(struct acx_softc *sc, struct acx_txbuf *txbuf, struct mbuf *m,
int error;
if (txbuf->tb_mbuf != NULL)
- panic("free TX buf has mbuf installed\n");
+ panic("free TX buf has mbuf installed");
error = 0;
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index bd56742bc06..ef274934cd0 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adv.c,v 1.32 2010/06/28 18:31:01 krw Exp $ */
+/* $OpenBSD: adv.c,v 1.33 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */
/*
@@ -852,7 +852,7 @@ adv_narrow_isr_callback(sc, qdonep)
bus_dmamap_unload(dmat, ccb->dmamap_xfer);
}
if ((ccb->flags & CCB_ALLOC) == 0) {
- panic("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
+ panic("%s: exiting ccb not allocated!", sc->sc_dev.dv_xname);
return;
}
/*
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 805b6be0c9f..e66a45de659 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adw.c,v 1.46 2010/06/28 18:31:01 krw Exp $ */
+/* $OpenBSD: adw.c,v 1.47 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -1044,7 +1044,7 @@ adw_isr_callback(sc, scsiq)
TAILQ_REMOVE(&sc->sc_pending_ccb, ccb, chain);
if ((ccb->flags & CCB_ALLOC) == 0) {
- panic("%s: unallocated ccb found on pending list!\n",
+ panic("%s: unallocated ccb found on pending list!",
sc->sc_dev.dv_xname);
adw_free_ccb(sc, ccb);
return;
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index 9d380cdc1f0..6150269c24c 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bha.c,v 1.25 2010/06/28 18:31:02 krw Exp $ */
+/* $OpenBSD: bha.c,v 1.26 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */
#undef BHADEBUG
@@ -739,13 +739,13 @@ bha_done(sc, ccb)
*/
#ifdef BHADIAG
if (ccb->flags & CCB_SENDING) {
- panic("%s: exiting ccb still in transit!\n",
+ panic("%s: exiting ccb still in transit!",
sc->sc_dev.dv_xname);
return;
}
#endif
if ((ccb->flags & CCB_ALLOC) == 0) {
- panic("%s: exiting ccb not allocated!\n",
+ panic("%s: exiting ccb not allocated!",
sc->sc_dev.dv_xname);
return;
}
@@ -1453,7 +1453,7 @@ bha_timeout(arg)
*/
bha_collect_mbo(sc);
if (ccb->flags & CCB_SENDING)
- panic("%s: not taking commands!\n", sc->sc_dev.dv_xname);
+ panic("%s: not taking commands!", sc->sc_dev.dv_xname);
#endif
/*
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index d4e994b6744..c2c82cf7b05 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwi.c,v 1.93 2010/08/06 05:26:24 mglocker Exp $ */
+/* $OpenBSD: bwi.c,v 1.94 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -856,7 +856,7 @@ bwi_attach(struct bwi_softc *sc)
error = ENXIO;
goto fail;
} else
- panic("unknown phymode %d\n", phy->phy_mode);
+ panic("unknown phymode %d", phy->phy_mode);
printf(", address %s\n", ether_sprintf(ic->ic_myaddr));
@@ -2176,7 +2176,7 @@ bwi_mac_hostflags_init(struct bwi_mac *mac)
if (phy->phy_rev >= 2 && rf->rf_type == BWI_RF_T_BCM2050)
host_flags &= ~BWI_HFLAG_GDC_WA;
} else {
- panic("unknown PHY mode %u\n", phy->phy_mode);
+ panic("unknown PHY mode %u", phy->phy_mode);
}
HFLAGS_WRITE(mac, host_flags);
@@ -2276,7 +2276,7 @@ bwi_mac_set_ackrates(struct bwi_mac *mac, const struct ieee80211_rateset *rs)
IEEE80211_MODE_11G) & 0xf) * 2;
break;
default:
- panic("unsupported modtype %u\n", modtype);
+ panic("unsupported modtype %u", modtype);
}
MOBJ_WRITE_2(mac, BWI_COMM_MOBJ, ofs + 0x20,
@@ -4264,7 +4264,7 @@ bwi_phy812_value(struct bwi_mac *mac, uint16_t lpd)
case 0x100:
return ((0x2093 | ext_lna));
default:
- panic("unsupported lpd\n");
+ panic("unsupported lpd");
}
} else {
ext_lna |= (loop << 8);
@@ -4277,11 +4277,11 @@ bwi_phy812_value(struct bwi_mac *mac, uint16_t lpd)
case 0x100:
return ((0x93 | ext_lna));
default:
- panic("unsupported lpd\n");
+ panic("unsupported lpd");
}
}
- panic("never reached\n");
+ panic("never reached");
return (0);
}
@@ -6529,7 +6529,7 @@ bwi_led_event(struct bwi_softc *sc, int event)
rate = 0;
break;
default:
- panic("unknown LED event %d\n", event);
+ panic("unknown LED event %d", event);
break;
}
bwi_led_blink_start(sc, bwi_led_duration[rate].on_dur,
@@ -8544,7 +8544,7 @@ bwi_plcp_header(void *plcp, int pkt_len, uint8_t rate)
else if (modtype == IEEE80211_MODTYPE_DS)
bwi_ds_plcp_header(plcp, pkt_len, rate);
else
- panic("unsupport modulation type %u\n", modtype);
+ panic("unsupport modulation type %u", modtype);
}
enum bwi_modtype
@@ -8616,7 +8616,7 @@ bwi_ack_rate(struct ieee80211_node *ni, uint8_t rate)
ack_rate = 48;
break;
default:
- panic("unsupported rate %d\n", rate);
+ panic("unsupported rate %d", rate);
}
return ack_rate;
}
@@ -9103,7 +9103,7 @@ bwi_regwin_name(const struct bwi_regwin *rw)
case BWI_REGWIN_T_BUSPCIE:
return ("PCIE");
}
- panic("unknown regwin type 0x%04x\n", rw->rw_type);
+ panic("unknown regwin type 0x%04x", rw->rw_type);
return (NULL);
}
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index 26d4ccf284c..a666502d8dc 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpi.c,v 1.155 2010/07/06 07:18:18 dlg Exp $ */
+/* $OpenBSD: mpi.c,v 1.156 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org>
@@ -871,7 +871,7 @@ mpi_reply(struct mpi_softc *sc, u_int32_t reg)
break;
default:
- panic("%s: unsupported context reply\n",
+ panic("%s: unsupported context reply",
DEVNAME(sc));
}
}
@@ -2416,7 +2416,7 @@ mpi_fwupload(struct mpi_softc *sc)
}
if (ccb->ccb_rcb == NULL)
- panic("%s: unable to do fw upload\n", DEVNAME(sc));
+ panic("%s: unable to do fw upload", DEVNAME(sc));
upp = ccb->ccb_rcb->rcb_reply;
if (letoh16(upp->ioc_status) != MPI_IOCSTATUS_SUCCESS)
@@ -2540,7 +2540,7 @@ mpi_req_cfg_header(struct mpi_softc *sc, u_int8_t type, u_int8_t number,
mpi_wait(sc, ccb);
if (ccb->ccb_rcb == NULL)
- panic("%s: unable to fetch config header\n", DEVNAME(sc));
+ panic("%s: unable to fetch config header", DEVNAME(sc));
cp = ccb->ccb_rcb->rcb_reply;
DNPRINTF(MPI_D_MISC, "%s: action: 0x%02x msg_length: %d function: "
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 6e6d57894b2..67740f4eefb 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgt.c,v 1.59 2010/05/19 15:27:35 oga Exp $ */
+/* $OpenBSD: pgt.c,v 1.60 2010/08/07 03:50:01 krw Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -2675,7 +2675,7 @@ badopmode:
DPRINTF(("IEEE80211_MODE_AUTO\n"));
break;
default:
- panic("unknown mode %d\n", ic->ic_curmode);
+ panic("unknown mode %d", ic->ic_curmode);
}
switch (sc->sc_80211_ioc_auth) {
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index 0cc77f7c519..42cd3da7987 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re.c,v 1.124 2010/07/27 20:53:39 kettenis Exp $ */
+/* $OpenBSD: re.c,v 1.125 2010/08/07 03:50:01 krw Exp $ */
/* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -2306,7 +2306,7 @@ re_config_imtype(struct rl_softc *sc, int imtype)
break;
default:
- panic("%s: unknown imtype %d\n",
+ panic("%s: unknown imtype %d",
sc->sc_dev.dv_xname, imtype);
}
}
@@ -2339,7 +2339,7 @@ re_setup_intr(struct rl_softc *sc, int enable_intrs, int imtype)
break;
default:
- panic("%s: unknown imtype %d\n",
+ panic("%s: unknown imtype %d",
sc->sc_dev.dv_xname, imtype);
}
}
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 0db1a6efae3..feb5379744e 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha.c,v 1.20 2010/06/30 19:06:16 mk Exp $ */
+/* $OpenBSD: uha.c,v 1.21 2010/08/07 03:50:01 krw Exp $ */
/* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */
#undef UHADEBUG
@@ -286,7 +286,7 @@ uha_done(sc, mscp)
* into the xfer and call whoever started it
*/
if ((mscp->flags & MSCP_ALLOC) == 0) {
- panic("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
+ panic("%s: exiting ccb not allocated!", sc->sc_dev.dv_xname);
return;
}
if (xs->error == XS_NOERROR) {