Module Name:    src
Committed By:   christos
Date:           Sat Mar 14 03:01:36 UTC 2020

Modified Files:
        src/sys/dev/usb: if_aue.c if_smsc.c umass.c uplcom.c usb_quirks.c
            usb_subr.c usbnet.c xhci.c

Log Message:
fix more broken kernhist formats (now I got them all).


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.182 -r1.183 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.243 -r1.244 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/usbnet.c
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/usb/xhci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.166 src/sys/dev/usb/if_aue.c:1.167
--- src/sys/dev/usb/if_aue.c:1.166	Fri Mar 13 22:35:33 2020
+++ src/sys/dev/usb/if_aue.c	Fri Mar 13 23:01:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_aue.c,v 1.166 2020/03/14 02:35:33 christos Exp $	*/
+/*	$NetBSD: if_aue.c,v 1.167 2020/03/14 03:01:36 christos Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.166 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.167 2020/03/14 03:01:36 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -533,7 +533,7 @@ aue_mii_write_reg(struct usbnet *un, int
 	}
 
 	if (i == AUE_TIMEOUT) {
-		DPRINTF("aue%d: phy=%#jx reg=%#jx val=%#jx write timed out",
+		DPRINTF("aue%jd: phy=%#jx reg=%#jx val=%#jx write timed out",
 		    device_unit(un->un_dev), phy, reg, val);
 		return ETIMEDOUT;
 	}
@@ -587,7 +587,7 @@ aue_mii_statchg(struct ifnet *ifp)
 	usbnet_unlock_mii(un);
 
 	if (usbnet_havelink(un) != hadlink) {
-		DPRINTFN(5, "aue%d: exit link %d",
+		DPRINTFN(5, "aue%jd: exit link %jd",
 		    device_unit(un->un_dev), usbnet_havelink(un), 0, 0);
 	}
 }
@@ -736,7 +736,7 @@ aue_reset(struct aue_softc *sc)
 	delay(10000);	/* XXX */
 	//usbd_delay_ms(un->un_udev, 10);	/* XXX */
 
-	DPRINTFN(2, "aue%d: exit", device_unit(un->un_dev), 0, 0, 0);
+	DPRINTFN(2, "aue%jd: exit", device_unit(un->un_dev), 0, 0, 0);
 }
 
 /*
@@ -959,7 +959,7 @@ aue_tx_prepare(struct usbnet *un, struct
 	buf[1] = (uint8_t)(m->m_pkthdr.len >> 8);
 	total_len = m->m_pkthdr.len + 2;
 
-	DPRINTFN(5, "aue%d: send %d bytes",
+	DPRINTFN(5, "aue%jd: send %jd bytes",
 	    device_unit(un->un_dev), total_len, 0, 0);
 
 	return total_len;

Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.66 src/sys/dev/usb/if_smsc.c:1.67
--- src/sys/dev/usb/if_smsc.c:1.66	Fri Mar 13 22:35:33 2020
+++ src/sys/dev/usb/if_smsc.c	Fri Mar 13 23:01:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smsc.c,v 1.66 2020/03/14 02:35:33 christos Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.67 2020/03/14 03:01:36 christos Exp $	*/
 
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.66 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.67 2020/03/14 03:01:36 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -539,10 +539,10 @@ smsc_setmacaddress(struct usbnet *un, co
 	int err;
 	uint32_t val;
 
-	DPRINTF("setting mac address to %02jx:%02jx:%02jx:...", addr[0], addr[1],
-	    addr[2], 0);
+	DPRINTF("setting mac address to %02jx:%02jx:%02jx:...", addr[0],
+	    addr[1], addr[2], 0);
 
-	DPRINTF("... %02jx:%0j2x:%02jx", addr[3], addr[4], addr[5], 0);
+	DPRINTF("... %02jx:%02jx:%02jx", addr[3], addr[4], addr[5], 0);
 
 	val = ((uint32_t)addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8)
 	    | addr[0];

Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.182 src/sys/dev/usb/umass.c:1.183
--- src/sys/dev/usb/umass.c:1.182	Fri Mar 13 22:35:33 2020
+++ src/sys/dev/usb/umass.c	Fri Mar 13 23:01:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.182 2020/03/14 02:35:33 christos Exp $	*/
+/*	$NetBSD: umass.c,v 1.183 2020/03/14 03:01:36 christos Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.182 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.183 2020/03/14 03:01:36 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1021,7 +1021,7 @@ umass_setup_transfer(struct umass_softc 
 
 	err = usbd_transfer(xfer);
 	DPRINTFM(UDMASS_XFER, "start xfer buffer=%#jx buflen=%jd flags=%#jx "
-	    "timeout=%d", (uintptr_t)buffer, buflen, flags, sc->timeout);
+	    "timeout=%jd", (uintptr_t)buffer, buflen, flags, sc->timeout);
 	if (err && err != USBD_IN_PROGRESS) {
 		DPRINTFM(UDMASS_BBB, "failed to setup transfer... err=%jd",
 		    err, 0, 0, 0);
@@ -1880,7 +1880,7 @@ umass_cbi_state(struct usbd_xfer *xfer, 
 
 			if (err) {
 				DPRINTFM(UDMASS_CBI, "sc %#jx: Data dir %jd "
-				    "err %d failed",
+				    "err %jd failed",
 				    (uintptr_t)sc, sc->transfer_dir,
 				    sc->transfer_datalen, err);
 

Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.88 src/sys/dev/usb/uplcom.c:1.89
--- src/sys/dev/usb/uplcom.c:1.88	Fri Mar 13 22:35:33 2020
+++ src/sys/dev/usb/uplcom.c	Fri Mar 13 23:01:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: uplcom.c,v 1.88 2020/03/14 02:35:33 christos Exp $	*/
+/*	$NetBSD: uplcom.c,v 1.89 2020/03/14 03:01:36 christos Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.88 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.89 2020/03/14 03:01:36 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -453,7 +453,7 @@ uplcom_attach(device_t parent, device_t 
 
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
 
-	DPRINTF("in=%#x out=%#x intr=%#x",
+	DPRINTF("in=%#jx out=%#jx intr=%#jx",
 	    ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number, 0);
 	sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
 					    ucomprint, ucomsubmatch);
@@ -497,7 +497,7 @@ uplcom_detach(device_t self, int flags)
 	int rv = 0;
 
 	UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
-	DPRINTF("sc=%#jx flags=%d", (uintptr_t)sc, flags, 0, 0);
+	DPRINTF("sc=%#jx flags=%jd", (uintptr_t)sc, flags, 0, 0);
 
 	sc->sc_dying = true;
  
@@ -643,7 +643,7 @@ uplcom_dtr(struct uplcom_softc *sc, int 
 {
 
 	UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
-	DPRINTF("onoff=%d", onoff, 0, 0, 0);
+	DPRINTF("onoff=%jd", onoff, 0, 0, 0);
 
 	if (sc->sc_dtr != -1 && !sc->sc_dtr == !onoff)
 		return;
@@ -657,7 +657,7 @@ static void
 uplcom_rts(struct uplcom_softc *sc, int onoff)
 {
 	UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
-	DPRINTF("onoff=%d", onoff, 0, 0, 0);
+	DPRINTF("onoff=%jd", onoff, 0, 0, 0);
 
 	if (sc->sc_rts != -1 && !sc->sc_rts == !onoff)
 		return;
@@ -673,7 +673,7 @@ uplcom_break(struct uplcom_softc *sc, in
 	usb_device_request_t req;
 
 	UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
-	DPRINTF("onoff=%d", onoff, 0, 0, 0);
+	DPRINTF("onoff=%jd", onoff, 0, 0, 0);
 
 	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 	req.bRequest = UCDC_SEND_BREAK;
@@ -703,7 +703,7 @@ uplcom_set_crtscts(struct uplcom_softc *
 
 	err = usbd_do_request(sc->sc_udev, &req, 0);
 	if (err) {
-		DPRINTF("failed, err=%d", err, 0, 0, 0);
+		DPRINTF("failed, err=%jd", err, 0, 0, 0);
 		return err;
 	}
 
@@ -718,7 +718,7 @@ uplcom_set_line_coding(struct uplcom_sof
 
 	UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
 
-	DPRINTF("rate=%d fmt=%d parity=%d bits=%d",
+	DPRINTF("rate=%jd fmt=%jd parity=%jd bits=%jd",
 		UGETDW(state->dwDTERate), state->bCharFormat,
 		state->bParityType, state->bDataBits);
 
@@ -735,7 +735,7 @@ uplcom_set_line_coding(struct uplcom_sof
 
 	err = usbd_do_request(sc->sc_udev, &req, state);
 	if (err) {
-		DPRINTF("failed, err=%u", err, 0, 0, 0);
+		DPRINTF("failed, err=%ju", err, 0, 0, 0);
 		return err;
 	}
 
@@ -786,7 +786,7 @@ uplcom_param(void *addr, int portno, str
 
 	err = uplcom_set_line_coding(sc, &ls);
 	if (err) {
-		DPRINTF("err=%d", err, 0, 0, 0);
+		DPRINTF("err=%jd", err, 0, 0, 0);
 		return EIO;
 	}
 
@@ -797,7 +797,7 @@ uplcom_param(void *addr, int portno, str
 		uplcom_set_line_state(sc);
 
 	if (err) {
-		DPRINTF("err=%d", err, 0, 0, 0);
+		DPRINTF("err=%jd", err, 0, 0, 0);
 		return EIO;
 	}
 
@@ -822,7 +822,7 @@ uplcom_vendor_control_write(struct usbd_
 	err = usbd_do_request(dev, &req, NULL);
 
 	if (err) {
-		DPRINTF("vendor write failed, err=%d", err, 0, 0, 0);
+		DPRINTF("vendor write failed, err=%jd", err, 0, 0, 0);
 	}
 
 	return err;
@@ -853,7 +853,7 @@ uplcom_open(void *addr, int portno)
 			sc->sc_intr_buf, sc->sc_isize,
 			uplcom_intr, USBD_DEFAULT_INTERVAL);
 		if (err) {
-			DPRINTF("cannot open interrupt pipe (addr %d)",
+			DPRINTF("cannot open interrupt pipe (addr %jd)",
 				sc->sc_intr_number, 0, 0, 0);
 		}
 	}
@@ -894,12 +894,12 @@ uplcom_intr(struct usbd_xfer *xfer, void
 		if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
 			return;
 
-		DPRINTF("abnormal status: %u", status, 0, 0, 0);
+		DPRINTF("abnormal status: %ju", status, 0, 0, 0);
 		usbd_clear_endpoint_stall_async(sc->sc_intr_pipe);
 		return;
 	}
 
-	DPRINTF("uplcom status = %02x", buf[8], 0, 0, 0);
+	DPRINTF("uplcom status = %02jx", buf[8], 0, 0, 0);
 
 	sc->sc_lsr = sc->sc_msr = 0;
 	pstatus = buf[8];

Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.94 src/sys/dev/usb/usb_quirks.c:1.95
--- src/sys/dev/usb/usb_quirks.c:1.94	Fri Mar 13 22:35:33 2020
+++ src/sys/dev/usb/usb_quirks.c	Fri Mar 13 23:01:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_quirks.c,v 1.94 2020/03/14 02:35:33 christos Exp $	*/
+/*	$NetBSD: usb_quirks.c,v 1.95 2020/03/14 03:01:36 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.94 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.95 2020/03/14 03:01:36 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -128,7 +128,7 @@ usbd_get_desc_fake(struct usbd_device *d
 	usbd_status err = USBD_INVAL;
 
 	if (dev->ud_quirks == NULL || dev->ud_quirks->desc == NULL) {
-		DPRINTF("%04x/%04x: no fake descriptors",
+		DPRINTF("%04jx/%04j: no fake descriptors",
 		        UGETW(dd->idVendor), UGETW(dd->idProduct), 0, 0);
 		goto out;
 	}
@@ -140,7 +140,7 @@ usbd_get_desc_fake(struct usbd_device *d
 	}
 
 	if (dev->ud_quirks->desc[j] == NULL) {
-		DPRINTF("%04x/%04x: no fake descriptor type = %d, len = %d",
+		DPRINTF("%04jx/%04jx: no fake descriptor type = %jd, len = %jd",
 		       UGETW(dd->idVendor), UGETW(dd->idProduct), type, len);
 		goto out;
 	}
@@ -149,14 +149,14 @@ usbd_get_desc_fake(struct usbd_device *d
 		ub = dev->ud_quirks->desc[j];
 
 		if (ub->bLength > len) {
-			DPRINTF("%04x/%04x: short buf len = %d, bLength = %d",
+			DPRINTF("%04jx/%04jx: short buf len = %jd, bLength = %jd",
 			        UGETW(dd->idVendor), UGETW(dd->idProduct),
 			        type, ub->bLength);
 			goto out;
 		}
 
 		memcpy(desc, ub, ub->bLength);
-		DPRINTF("%04x/%04x: Use fake descriptor type %d",
+		DPRINTF("%04jx/%04jx: Use fake descriptor type %jd",
 			UGETW(dd->idVendor), UGETW(dd->idProduct),
 			type, 0);
 
@@ -168,10 +168,10 @@ usbd_get_desc_fake(struct usbd_device *d
 
 	err = USBD_NORMAL_COMPLETION;
 
-	DPRINTF("%04x/%04x: Using fake USB descriptors\n",
+	DPRINTF("%04jx/%04jx: Using fake USB descriptors\n",
 	        UGETW(dd->idVendor), UGETW(dd->idProduct), 0, 0);
 out:
-	DPRINTF("return err = %d", err, 0, 0, 0);
+	DPRINTF("return err = %jd", err, 0, 0, 0);
 	return err;
 }
 

Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.243 src/sys/dev/usb/usb_subr.c:1.244
--- src/sys/dev/usb/usb_subr.c:1.243	Fri Mar 13 22:35:33 2020
+++ src/sys/dev/usb/usb_subr.c	Fri Mar 13 23:01:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.243 2020/03/14 02:35:33 christos Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.244 2020/03/14 03:01:36 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.243 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.244 2020/03/14 03:01:36 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1011,7 +1011,7 @@ usbd_probe_and_attach(device_t parent, s
 		err = usbd_set_config_index(dev, confi, 1);
 		if (err) {
 			DPRINTF("port %jd, set config at addr %jd failed, "
-			    "error=%d", port, addr, err, 0);
+			    "error=%jd", port, addr, err, 0);
 			printf("%s: port %d, set config at addr %d failed\n",
 			    device_xname(parent), port, addr);
 			return err;

Index: src/sys/dev/usb/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.36 src/sys/dev/usb/usbnet.c:1.37
--- src/sys/dev/usb/usbnet.c:1.36	Fri Mar 13 14:17:41 2020
+++ src/sys/dev/usb/usbnet.c	Fri Mar 13 23:01:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbnet.c,v 1.36 2020/03/13 18:17:41 christos Exp $	*/
+/*	$NetBSD: usbnet.c,v 1.37 2020/03/14 03:01:36 christos Exp $	*/
 
 /*
  * Copyright (c) 2019 Matthew R. Green
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.36 2020/03/13 18:17:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.37 2020/03/14 03:01:36 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -475,7 +475,7 @@ usbnet_start_locked(struct ifnet *ifp)
 	KASSERT(cd->uncd_tx_cnt <= un->un_tx_list_cnt);
 
 	if (!unp->unp_link || (ifp->if_flags & IFF_RUNNING) == 0) {
-		DPRINTF("start called no link (%x) or running (flags %x)",
+		DPRINTF("start called no link (%jx) or running (flags %jx)",
 		    unp->unp_link, ifp->if_flags, 0, 0);
 		return;
 	}
@@ -516,7 +516,7 @@ usbnet_start_locked(struct ifnet *ifp)
 		/* Transmit */
 		usbd_status err = usbd_transfer(c->unc_xfer);
 		if (err != USBD_IN_PROGRESS) {
-			DPRINTF("usbd_transfer on %#jx for %ju bytes: %d",
+			DPRINTF("usbd_transfer on %#jx for %ju bytes: %jd",
 			    (uintptr_t)c->unc_buf, length, err, 0);
 			if_statinc(ifp, if_oerrors);
 			break;
@@ -537,7 +537,7 @@ usbnet_start_locked(struct ifnet *ifp)
 	}
 	cd->uncd_tx_prod = idx;
 
-	DPRINTF("finished with start; tx_cnt %d list_cnt %d link %d",
+	DPRINTF("finished with start; tx_cnt %jd list_cnt %jd link %jd",
 	    cd->uncd_tx_cnt, un->un_tx_list_cnt, unp->unp_link, 0);
 
 	/*
@@ -1155,13 +1155,13 @@ usbnet_watchdog(struct ifnet *ifp)
 	aprint_error_dev(un->un_dev, "watchdog timeout\n");
 
 	if (cd->uncd_tx_cnt > 0) {
-		DPRINTF("uncd_tx_cnt=%u non zero, aborting pipe", 0, 0, 0, 0);
+		DPRINTF("uncd_tx_cnt=%ju non zero, aborting pipe", 0, 0, 0, 0);
 		err = usbd_abort_pipe(unp->unp_ep[USBNET_ENDPT_TX]);
 		if (err)
 			aprint_error_dev(un->un_dev, "pipe abort failed: %s\n",
 			    usbd_errstr(err));
 		if (cd->uncd_tx_cnt != 0)
-			DPRINTF("uncd_tx_cnt now %u", cd->uncd_tx_cnt, 0, 0, 0);
+			DPRINTF("uncd_tx_cnt now %ju", cd->uncd_tx_cnt, 0, 0, 0);
 	}
 
 	if (!IFQ_IS_EMPTY(&ifp->if_snd))

Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.121 src/sys/dev/usb/xhci.c:1.122
--- src/sys/dev/usb/xhci.c:1.121	Fri Mar 13 22:35:34 2020
+++ src/sys/dev/usb/xhci.c	Fri Mar 13 23:01:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.121 2020/03/14 02:35:34 christos Exp $	*/
+/*	$NetBSD: xhci.c,v 1.122 2020/03/14 03:01:36 christos Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.121 2020/03/14 02:35:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.122 2020/03/14 03:01:36 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1308,7 +1308,7 @@ xhci_intr1(struct xhci_softc * const sc)
 	if ((usbsts & (XHCI_STS_HSE | XHCI_STS_EINT | XHCI_STS_PCD |
 	    XHCI_STS_HCE)) == 0) {
 		DPRINTFN(16, "ignored intr not for %jd",
-		    device_uinit(sc->sc_dev), 0, 0, 0);
+		    device_unit(sc->sc_dev), 0, 0, 0);
 		return 0;
 	}
 
@@ -3147,7 +3147,7 @@ xhci_setup_route(struct usbd_pipe *pipe,
 	for (hub = dev; hub != NULL; hub = hub->ud_myhub) {
 		uint32_t dep;
 
-		DPRINTFN(4, "hub %#jx depth %jd upport %jp upportno %jd",
+		DPRINTFN(4, "hub %#jx depth %jd upport %#jx upportno %jd",
 		    (uintptr_t)hub, hub->ud_depth, (uintptr_t)hub->ud_powersrc,
 		    hub->ud_powersrc ? (uintptr_t)hub->ud_powersrc->up_portno :
 			 -1);

Reply via email to