Re: PR/55068 CVS commit: src/sys/dev/usb

[sc.dying%gmail.com@localhost]

On 2020/03/14 01:26, sc.dying%gmail.com@localhost wrote:
> On 2020/03/13 18:20, Christos Zoulas wrote:
>> The following reply was made to PR kern/55068; it has been noted by GNATS.
>>
>> From: "Christos Zoulas" <christos%netbsd.org@localhost>
>> To: gnats-bugs%gnats.NetBSD.org@localhost
>> Cc: 
>> Subject: PR/55068 CVS commit: src/sys/dev/usb
>> Date: Fri, 13 Mar 2020 14:17:42 -0400
>>
>>  Module Name:	src
>>  Committed By:	christos
>>  Date:		Fri Mar 13 18:17:41 UTC 2020
>>  
>>  Modified Files:
>>  	src/sys/dev/usb: aubtfwl.c auvitek.c ehci.c emdtv.c emdtv_dtv.c
>>  	    ezload.c if_athn_usb.c if_atu.c if_aue.c if_axen.c if_cue.c
>>  	    if_mue.c if_otus.c if_rum.c if_run.c if_smsc.c if_udav.c if_umb.c
>>  	    if_upgt.c if_ural.c if_ure.c if_url.c if_urndis.c if_urtw.c
>>  	    if_urtwn.c if_zyd.c irmce.c motg.c ohci.c pseye.c uatp.c uaudio.c
>>  	    ubsa.c ubsa_common.c uchcom.c ucom.c ucycom.c udsbr.c udsir.c
>>  	    uftdi.c ugen.c ugensa.c uhci.c uhidev.c uhmodem.c uhso.c uipaq.c
>>  	    uirda.c ukbd.c ulpt.c umass.c umass_isdata.c umass_scsipi.c umct.c
>>  	    umodem_common.c uplcom.c usb_quirks.c usbdi.c usbdi_util.c usbnet.c
>>  	    uslsa.c usscanner.c ustir.c uthum.c utoppy.c uts.c uvideo.c
>>  	    uvisor.c uvscom.c vhci.c xhci.c
>>  
>>  Log Message:
>>  PR/55068: sc.dying: Fix printf formats:
>>  - no %s/%p for kernel log
>>  - 0x% -> %#
>>  - always %j for kernel log
> 
> Thank you for fixing these.
> 
> A little bit more fixes are attached.
Oops, one more.

--- src/sys/dev/usb/xhci.c.orig	2020-03-13 23:49:33.471927504 +0000
+++ src/sys/dev/usb/xhci.c	2020-03-14 02:08:25.182149848 +0000
@@ -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;
 	}