From fd4371e84bfe456363d8522471f8e03b42c3f36e Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Sat, 12 Oct 2002 01:09:46 +0000 Subject: Remove more '\n's from panic() statements. Both trailing and leading. Diff generated by Chris Kuethe. --- sys/dev/usb/ohci.c | 16 ++++++++-------- sys/dev/usb/uhci.c | 14 +++++++------- sys/dev/usb/ulpt.c | 4 ++-- sys/dev/usb/umass.c | 18 +++++++++--------- sys/dev/usb/usbdi.c | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) (limited to 'sys/dev/usb') diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 0dd75bbc0a6..dc9f3aa1084 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.31 2002/08/07 18:57:00 mickey Exp $ */ +/* $OpenBSD: ohci.c,v 1.32 2002/10/12 01:09:44 krw Exp $ */ /* $NetBSD: ohci.c,v 1.104 2001/09/28 23:57:21 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -510,7 +510,7 @@ ohci_alloc_std_chain(struct ohci_pipe *opipe, ohci_softc_t *sc, curlen -= curlen % UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize); #ifdef DIAGNOSTIC if (curlen == 0) - panic("ohci_alloc_std: curlen == 0\n"); + panic("ohci_alloc_std: curlen == 0"); #endif } DPRINTFN(4,("ohci_alloc_std_chain: dataphys=0x%08x " @@ -625,7 +625,7 @@ ohci_free_sitd(ohci_softc_t *sc, ohci_soft_itd_t *sitd) #ifdef DIAGNOSTIC if (!sitd->isdone) { - panic("ohci_free_sitd: sitd=%p not done\n", sitd); + panic("ohci_free_sitd: sitd=%p not done", sitd); return; } #endif @@ -1227,7 +1227,7 @@ ohci_add_done(ohci_softc_t *sc, ohci_physaddr_t done) DPRINTFN(5,("add ITD %p\n", sitd)); continue; } - panic("ohci_add_done: addr 0x%08lx not found\n", (u_long)done); + panic("ohci_add_done: addr 0x%08lx not found", (u_long)done); } /* sdone & sidone now hold the done lists. */ @@ -1389,7 +1389,7 @@ ohci_device_ctrl_done(usbd_xfer_handle xfer) #ifdef DIAGNOSTIC if (!(xfer->rqflags & URQ_REQUEST)) { - panic("ohci_ctrl_done: not a request\n"); + panic("ohci_ctrl_done: not a request"); } #endif xfer->hcpriv = NULL; @@ -1694,7 +1694,7 @@ ohci_rem_ed(ohci_soft_ed_t *sed, ohci_soft_ed_t *head) for (p = head; p == NULL && p->next != sed; p = p->next) ; if (p == NULL) - panic("ohci_rem_ed: ED not found\n"); + panic("ohci_rem_ed: ED not found"); p->next = sed->next; p->ed.ed_nexted = sed->ed.ed_nexted; } @@ -2825,7 +2825,7 @@ ohci_device_intr_start(usbd_xfer_handle xfer) #ifdef DIAGNOSTIC if (xfer->rqflags & URQ_REQUEST) - panic("ohci_device_intr_transfer: a request\n"); + panic("ohci_device_intr_transfer: a request"); #endif len = xfer->length; @@ -2918,7 +2918,7 @@ ohci_device_intr_close(usbd_pipe_handle pipe) ; #ifdef DIAGNOSTIC if (p == NULL) - panic("ohci_device_intr_close: ED not found\n"); + panic("ohci_device_intr_close: ED not found"); #endif p->next = sed->next; p->ed.ed_nexted = sed->ed.ed_nexted; diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 8606759f3f4..525c8be710c 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.26 2002/07/09 18:19:58 nate Exp $ */ +/* $OpenBSD: uhci.c,v 1.27 2002/10/12 01:09:44 krw Exp $ */ /* $NetBSD: uhci.c,v 1.142 2001/10/25 02:08:13 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -1507,7 +1507,7 @@ uhci_waitintr(uhci_softc_t *sc, usbd_xfer_handle xfer) ; #ifdef DIAGNOSTIC if (ii == NULL) - panic("uhci_waitintr: lost intr_info\n"); + panic("uhci_waitintr: lost intr_info"); #endif uhci_idone(ii); } @@ -1790,7 +1790,7 @@ uhci_device_bulk_start(usbd_xfer_handle xfer) #ifdef DIAGNOSTIC if (xfer->rqflags & URQ_REQUEST) - panic("uhci_device_bulk_transfer: a request\n"); + panic("uhci_device_bulk_transfer: a request"); #endif len = xfer->length; @@ -1946,7 +1946,7 @@ uhci_device_ctrl_start(usbd_xfer_handle xfer) #ifdef DIAGNOSTIC if (!(xfer->rqflags & URQ_REQUEST)) - panic("uhci_device_ctrl_transfer: not a request\n"); + panic("uhci_device_ctrl_transfer: not a request"); #endif err = uhci_device_request(xfer); @@ -1995,7 +1995,7 @@ uhci_device_intr_start(usbd_xfer_handle xfer) #ifdef DIAGNOSTIC if (xfer->rqflags & URQ_REQUEST) - panic("uhci_device_intr_transfer: a request\n"); + panic("uhci_device_intr_transfer: a request"); #endif err = uhci_alloc_std_chain(upipe, sc, xfer->length, 1, xfer->flags, @@ -2623,7 +2623,7 @@ uhci_device_ctrl_done(usbd_xfer_handle xfer) #ifdef DIAGNOSTIC if (!(xfer->rqflags & URQ_REQUEST)) - panic("uhci_ctrl_done: not a request\n"); + panic("uhci_ctrl_done: not a request"); #endif uhci_del_intr_info(ii); /* remove from active list */ @@ -2945,7 +2945,7 @@ uhci_root_ctrl_start(usbd_xfer_handle xfer) #ifdef DIAGNOSTIC if (!(xfer->rqflags & URQ_REQUEST)) - panic("uhci_root_ctrl_transfer: not a request\n"); + panic("uhci_root_ctrl_transfer: not a request"); #endif req = &xfer->request; diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index ea574737d74..44c4e37b815 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ulpt.c,v 1.13 2002/07/25 04:07:33 nate Exp $ */ +/* $OpenBSD: ulpt.c,v 1.14 2002/10/12 01:09:44 krw Exp $ */ /* $NetBSD: ulpt.c,v 1.50 2002/07/11 21:14:31 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */ @@ -224,7 +224,7 @@ USB_ATTACH(ulpt) #ifdef DIAGNOSTIC if (ifcd < (usb_interface_descriptor_t *)cdesc || ifcd >= iend) - panic("ulpt: iface desc out of range\n"); + panic("ulpt: iface desc out of range"); #endif /* Step through all the descriptors looking for bidir mode */ for (id = ifcd, altno = 0; diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index ad9d539ab9f..30f49585d2c 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.18 2002/07/25 02:18:10 nate Exp $ */ +/* $OpenBSD: umass.c,v 1.19 2002/10/12 01:09:44 krw Exp $ */ /* $NetBSD: umass.c,v 1.49 2001/01/21 18:56:38 augustss Exp $ */ /*- * Copyright (c) 1999 MAEKAWA Masahide , @@ -1116,7 +1116,7 @@ USB_ATTACH(umass) sc->state = umass_cbi_state; #ifdef UMASS_DEBUG } else { - panic("%s:%d: Unknown proto 0x%02x\n", + panic("%s:%d: Unknown proto 0x%02x", __FILE__, __LINE__, sc->proto); #endif } @@ -1804,7 +1804,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv, } else if (sc->transfer_actlen > sc->transfer_datalen) { /* Buffer overrun! Don't let this go by unnoticed */ - panic("%s: transferred %d bytes instead of %d bytes\n", + panic("%s: transferred %d bytes instead of %d bytes", USBDEVNAME(sc->sc_dev), sc->transfer_actlen, sc->transfer_datalen); } @@ -1882,7 +1882,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv, /***** Default *****/ default: - panic("%s: Unknown state %d\n", + panic("%s: Unknown state %d", USBDEVNAME(sc->sc_dev), sc->transfer_state); } } @@ -2290,7 +2290,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv, /***** Default *****/ default: - panic("%s: Unknown state %d\n", + panic("%s: Unknown state %d", USBDEVNAME(sc->sc_dev), sc->transfer_state); } } @@ -2860,7 +2860,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status) umass_cam_sense_cb, (void *) ccb); } else { #ifdef UMASS_DEBUG - panic("transform(REQUEST_SENSE) failed\n"); + panic("transform(REQUEST_SENSE) failed"); #else csio->resid = sc->transfer_datalen; ccb->ccb_h.status = CAM_REQ_CMP_ERR; @@ -2874,7 +2874,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status) xpt_done(ccb); break; default: - panic("umass_cam_cb called for func_code %d\n", + panic("umass_cam_cb called for func_code %d", ccb->ccb_h.func_code); } break; @@ -2889,7 +2889,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status) break; default: - panic("%s: Unknown status %d in umass_cam_cb\n", + panic("%s: Unknown status %d in umass_cam_cb", USBDEVNAME(sc->sc_dev), status); } } @@ -3376,7 +3376,7 @@ umass_scsipi_cb(struct umass_softc *sc, void *priv, int residue, int status) break; default: - panic("%s: Unknown status %d in umass_scsipi_cb\n", + panic("%s: Unknown status %d in umass_scsipi_cb", USBDEVNAME(sc->sc_dev), status); } diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index 9e2570cf152..bdeb3e2ba0e 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi.c,v 1.20 2002/07/25 02:18:11 nate Exp $ */ +/* $OpenBSD: usbdi.c,v 1.21 2002/10/12 01:09:44 krw Exp $ */ /* $NetBSD: usbdi.c,v 1.81 2001/04/17 00:05:33 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */ @@ -294,7 +294,7 @@ usbd_transfer(usbd_xfer_handle xfer) s = splusb(); if (!xfer->done) { if (pipe->device->bus->use_polling) - panic("usbd_transfer: not done\n"); + panic("usbd_transfer: not done"); tsleep(xfer, PRIBIO, "usbsyn", 0); } splx(s); -- cgit v1.2.3