summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2005-07-18 02:43:28 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2005-07-18 02:43:28 +0000
commit1da0eb00b64cf96fafeda15abecc0ea97c01cfc7 (patch)
tree07ce3426901e09feb49ab2c3174d982a7fc02646 /sys/dev/ic
parentd682261e1331abf1c2f9fa2d157d5b8f51360fdd (diff)
remove trailing newline in panic(9); ok millert@ and deraadt@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/aic79xx.c22
-rw-r--r--sys/dev/ic/aic7xxx.c6
-rw-r--r--sys/dev/ic/aic7xxx_inline.h4
-rw-r--r--sys/dev/ic/ath.c6
-rw-r--r--sys/dev/ic/atw.c6
-rw-r--r--sys/dev/ic/rtw.c8
6 files changed, 26 insertions, 26 deletions
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index 7643c42aeda..2c42cefeef9 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic79xx.c,v 1.26 2005/02/20 15:35:34 miod Exp $ */
+/* $OpenBSD: aic79xx.c,v 1.27 2005/07/18 02:43:26 fgsch Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -1481,7 +1481,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
break;
}
default:
- panic("Unexpected TaskMgmt Func\n");
+ panic("Unexpected TaskMgmt Func");
break;
}
}
@@ -2037,7 +2037,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1)
printf("LQIRETRY for LQIPHASE_NLQ\n");
ahd_outb(ahd, LQCTL2, LQIRETRY);
} else
- panic("ahd_handle_lqiphase_error: No phase errors\n");
+ panic("ahd_handle_lqiphase_error: No phase errors");
ahd_dump_card_state(ahd);
ahd_outb(ahd, CLRINT, CLRSCSIINT);
ahd_unpause(ahd);
@@ -7327,7 +7327,7 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
if (scb == NULL) {
printf("qinpos = %d, SCB index = %d\n",
qinpos, ahd->qinfifo[qinpos]);
- panic("Loop 1\n");
+ panic("Loop 1");
}
if (ahd_match_scb(ahd, scb, target, channel, lun, tag, role)) {
@@ -7399,7 +7399,7 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
if (scb == NULL) {
printf("%s: SCB = 0x%x Not Active!\n",
ahd_name(ahd), scbid);
- panic("Waiting TID List traversal\n");
+ panic("Waiting TID List traversal");
}
ahd_set_scbptr(ahd, scbid);
tid_next = ahd_inw_scbram(ahd, SCB_NEXT2);
@@ -7525,7 +7525,7 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
if (scb == NULL) {
printf("%s: SCB = %d Not Active!\n",
ahd_name(ahd), scbid);
- panic("Waiting List traversal\n");
+ panic("Waiting List traversal");
}
ahd_set_scbptr(ahd, scbid);
*list_tail = scbid;
@@ -8312,7 +8312,7 @@ ahd_calc_residual(struct ahd_softc *ahd, struct scb *scb)
aic_freeze_scb(scb);
return;
} else if ((resid_sgptr & ~SG_PTR_MASK) != 0) {
- panic("Bogus resid sgptr value 0x%x\n", resid_sgptr);
+ panic("Bogus resid sgptr value 0x%x", resid_sgptr);
/* NOTREACHED */
} else {
struct ahd_dma_seg *sg;
@@ -10073,7 +10073,7 @@ ahd_update_scsiid(struct ahd_softc *ahd, u_int targid_mask)
u_int scsiid;
if ((ahd->features & AHD_MULTI_TID) == 0)
- panic("ahd_update_scsiid called on non-multitid unit\n");
+ panic("ahd_update_scsiid called on non-multitid unit");
/*
* Since we will rely on the TARGID mask
@@ -10375,7 +10375,7 @@ ahd_set_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
#ifdef AHD_DEBUG
if (ahd->src_mode == AHD_MODE_UNKNOWN
|| ahd->dst_mode == AHD_MODE_UNKNOWN)
- panic("Setting mode prior to saving it.\n");
+ panic("Setting mode prior to saving it.");
if ((ahd_debug & AHD_SHOW_MODEPTR) != 0)
printf("%s: Setting mode 0x%x\n", ahd_name(ahd),
ahd_build_mode_state(ahd, src, dst));
@@ -10408,7 +10408,7 @@ ahd_assert_modes(struct ahd_softc *ahd, ahd_mode srcmode,
#ifdef AHD_DEBUG
if ((srcmode & AHD_MK_MSK(ahd->src_mode)) == 0
|| (dstmode & AHD_MK_MSK(ahd->dst_mode)) == 0) {
- panic("%s:%s:%d: Mode assertion failed.\n",
+ panic("%s:%s:%d: Mode assertion failed.",
ahd_name(ahd), file, line);
}
#endif
@@ -10961,7 +10961,7 @@ ahd_queue_scb(struct ahd_softc *ahd, struct scb *scb)
ahd_swap_with_next_hscb(ahd, scb);
if (SCBID_IS_NULL(SCB_GET_TAG(scb)))
- panic("Attempt to queue invalid SCB tag %x\n",
+ panic("Attempt to queue invalid SCB tag %x",
SCB_GET_TAG(scb));
/*
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index ab0f2eeef94..cea6a30c940 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx.c,v 1.65 2005/06/01 21:49:53 miod Exp $ */
+/* $OpenBSD: aic7xxx.c,v 1.66 2005/07/18 02:43:26 fgsch Exp $ */
/* $NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $ */
/*
@@ -40,7 +40,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.65 2005/06/01 21:49:53 miod Exp $
+ * $Id: aic7xxx.c,v 1.66 2005/07/18 02:43:26 fgsch Exp $
*/
/*
* Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
@@ -6098,7 +6098,7 @@ ahc_calc_residual(struct ahc_softc *ahc, struct scb *scb)
/* Case 4 */
return;
} else if ((resid_sgptr & ~SG_PTR_MASK) != 0) {
- panic("Bogus resid sgptr value 0x%x\n", resid_sgptr);
+ panic("Bogus resid sgptr value 0x%x", resid_sgptr);
} else {
struct ahc_dma_seg *sg;
diff --git a/sys/dev/ic/aic7xxx_inline.h b/sys/dev/ic/aic7xxx_inline.h
index 02b6e137d40..5ddc5c6b157 100644
--- a/sys/dev/ic/aic7xxx_inline.h
+++ b/sys/dev/ic/aic7xxx_inline.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx_inline.h,v 1.10 2005/06/01 21:49:54 miod Exp $ */
+/* $OpenBSD: aic7xxx_inline.h,v 1.11 2005/07/18 02:43:26 fgsch Exp $ */
/* $NetBSD: aic7xxx_inline.h,v 1.4 2003/11/02 11:07:44 wiz Exp $ */
/*
@@ -471,7 +471,7 @@ ahc_queue_scb(struct ahc_softc *ahc, struct scb *scb)
if (scb->hscb->tag == SCB_LIST_NULL
|| scb->hscb->next == SCB_LIST_NULL)
- panic("Attempt to queue invalid SCB tag %x:%x\n",
+ panic("Attempt to queue invalid SCB tag %x:%x",
scb->hscb->tag, scb->hscb->next);
/*
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 7f8a59b2500..c1f0443932b 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ath.c,v 1.29 2005/05/28 23:45:10 reyk Exp $ */
+/* $OpenBSD: ath.c,v 1.30 2005/07/18 02:43:26 fgsch Exp $ */
/* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */
/*-
@@ -655,7 +655,7 @@ ath_chan2flags(struct ieee80211com *ic, struct ieee80211_channel *chan)
case IEEE80211_MODE_TURBO:
return CHANNEL_T;
default:
- panic("%s: unsupported mode %d\n", __func__, mode);
+ panic("%s: unsupported mode %d", __func__, mode);
return 0;
}
}
@@ -2797,7 +2797,7 @@ ath_state_to_led(enum ieee80211_state state)
case IEEE80211_S_RUN:
return HAL_LED_RUN;
default:
- panic("%s: unknown 802.11 state %d\n", __func__, state);
+ panic("%s: unknown 802.11 state %d", __func__, state);
return HAL_LED_INIT;
}
}
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index f5a0b637ac1..a06c15e25e6 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atw.c,v 1.33 2005/07/02 23:10:16 brad Exp $ */
+/* $OpenBSD: atw.c,v 1.34 2005/07/18 02:43:26 fgsch Exp $ */
/* $NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $ */
/*-
@@ -1478,7 +1478,7 @@ atw_tune(struct atw_softc *sc)
chan = ieee80211_chan2ieee(ic, ic->ic_bss->ni_chan);
if (chan == IEEE80211_CHAN_ANY)
- panic("%s: chan == IEEE80211_CHAN_ANY\n", __func__);
+ panic("%s: chan == IEEE80211_CHAN_ANY", __func__);
if (chan == sc->sc_cur_chan)
return 0;
@@ -2569,7 +2569,7 @@ atw_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
case IEEE80211_S_ASSOC:
break;
case IEEE80211_S_INIT:
- panic("%s: unexpected state IEEE80211_S_INIT\n", __func__);
+ panic("%s: unexpected state IEEE80211_S_INIT", __func__);
break;
case IEEE80211_S_SCAN:
timeout_add(&sc->sc_scan_to, atw_dwelltime * hz / 1000);
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index a51c66418b2..2bd416e20dd 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtw.c,v 1.34 2005/06/15 01:33:50 jsg Exp $ */
+/* $OpenBSD: rtw.c,v 1.35 2005/07/18 02:43:27 fgsch Exp $ */
/* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
/*-
@@ -1284,7 +1284,7 @@ rtw_intr_rx(struct rtw_softc *sc, u_int16_t isr)
goto next;
default:
/* XXX shorten rx ring, instead? */
- panic("%s: could not load DMA map\n",
+ panic("%s: could not load DMA map",
sc->sc_dev.dv_xname);
}
@@ -2059,7 +2059,7 @@ rtw_tune(struct rtw_softc *sc)
chan = ieee80211_chan2ieee(ic, ic->ic_bss->ni_chan);
if (chan == IEEE80211_CHAN_ANY)
- panic("%s: chan == IEEE80211_CHAN_ANY\n", __func__);
+ panic("%s: chan == IEEE80211_CHAN_ANY", __func__);
if (chan == sc->sc_cur_chan) {
RTW_DPRINTF(RTW_DEBUG_TUNE,
@@ -3169,7 +3169,7 @@ rtw_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
switch (nstate) {
case IEEE80211_S_INIT:
- panic("%s: unexpected state IEEE80211_S_INIT\n", __func__);
+ panic("%s: unexpected state IEEE80211_S_INIT", __func__);
break;
case IEEE80211_S_SCAN:
if (ostate != IEEE80211_S_SCAN) {