From 58ac352f325bbb9785f5096d466a057ef8b3915f Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Fri, 4 Jul 2003 23:11:13 +0000 Subject: [PATCH] remove \n at end of panic strings. They are added by the call to panic. This brings us more in line with Net/OpenBSD Obtained from: Net/OpenBSD --- sys/dev/usb/ohci.c | 16 ++++++++-------- sys/dev/usb/uhci.c | 14 +++++++------- sys/dev/usb/umass.c | 20 ++++++++++---------- sys/dev/usb/usbdi.c | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index cb44d4235599..8c174c5b1144 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -669,7 +669,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 @@ -1302,7 +1302,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. */ @@ -1487,7 +1487,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; @@ -1820,7 +1820,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; } @@ -2220,7 +2220,7 @@ ohci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) } if (xfer->device->bus->intr_context || !curproc) - panic("ohci_abort_xfer: not in process context\n"); + panic("ohci_abort_xfer: not in process context"); /* * Step 1: Make interrupt routine and hardware ignore xfer. @@ -3013,7 +3013,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; @@ -3104,7 +3104,7 @@ ohci_device_intr_close(usbd_pipe_handle pipe) #ifdef DIAGNOSTIC if ((le32toh(sed->ed.ed_tailp) & OHCI_HEADMASK) != (le32toh(sed->ed.ed_headp) & OHCI_HEADMASK)) - panic("%s: Intr pipe %p still has TDs queued\n", + panic("%s: Intr pipe %p still has TDs queued", USBDEVNAME(sc->sc_bus.bdev), pipe); #endif @@ -3112,7 +3112,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 498ef9bbe3cd..2c6b978a0295 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1525,7 +1525,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); } @@ -1808,7 +1808,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; @@ -1910,7 +1910,7 @@ uhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) } if (xfer->device->bus->intr_context || !curproc) - panic("uhci_abort_xfer: not in process context\n"); + panic("uhci_abort_xfer: not in process context"); /* * Step 1: Make interrupt routine and hardware ignore xfer. @@ -1993,7 +1993,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); @@ -2043,7 +2043,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 endpt = upipe->pipe.endpoint->edesc->bEndpointAddress; @@ -2689,7 +2689,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 */ @@ -3011,7 +3011,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/umass.c b/sys/dev/usb/umass.c index 8d9bff500057..2948734dd590 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -976,7 +976,7 @@ USB_ATTACH(umass) sc->state = umass_cbi_state; #ifdef USB_DEBUG } else { - panic("%s:%d: Unknown proto 0x%02x\n", + panic("%s:%d: Unknown proto 0x%02x", __FILE__, __LINE__, sc->proto); #endif } @@ -991,7 +991,7 @@ USB_ATTACH(umass) sc->transform = umass_rbc_transform; #ifdef USB_DEBUG else - panic("No transformation defined for command proto 0x%02x\n", + panic("No transformation defined for command proto 0x%02x", sc->proto & UMASS_PROTO_COMMAND); #endif @@ -1029,7 +1029,7 @@ USB_ATTACH(umass) USB_ATTACH_ERROR_RETURN; } } else { - panic("%s:%d: Unknown proto 0x%02x\n", + panic("%s:%d: Unknown proto 0x%02x", __FILE__, __LINE__, sc->proto); } @@ -1555,7 +1555,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 %db instead of %db\n", + panic("%s: transferred %db instead of %db", USBDEVNAME(sc->sc_dev), sc->transfer_actlen, sc->transfer_datalen); @@ -1616,7 +1616,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); } } @@ -2051,7 +2051,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); } } @@ -2552,7 +2552,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status) csio->sense_len, DIR_IN, umass_cam_sense_cb, (void *) ccb); } else { - panic("transform(REQUEST_SENSE) failed\n"); + panic("transform(REQUEST_SENSE) failed"); } break; } @@ -2561,7 +2561,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; @@ -2575,7 +2575,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status) xpt_done(ccb); 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); } } @@ -2652,7 +2652,7 @@ umass_cam_sense_cb(struct umass_softc *sc, void *priv, int residue, int status) NULL, 0, DIR_NONE, umass_cam_quirk_cb, (void *) ccb); } else { - panic("transform(TEST_UNIT_READY) failed\n"); + panic("transform(TEST_UNIT_READY) failed"); } break; } else { diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index 8ecc1ac701d6..5991fd6e2a99 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -337,7 +337,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);