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

[sc.dying%gmail.com@localhost]

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.

--- src/sys/dev/usb/usbdi.c.orig	2020-03-13 23:49:31.928263913 +0000
+++ src/sys/dev/usb/usbdi.c	2020-03-14 00:17:43.088159492 +0000
@@ -1006,7 +1006,7 @@ usb_transfer_complete(struct usbd_xfer *
 	    xfer->ux_status == USBD_TIMEOUT &&
 	    !usbd_xfer_isread(xfer)) {
 		USBHIST_LOG(usbdebug, "Possible output ack miss for xfer %#jx: "
-		    "hiding write timeout to %d.%s for %d bytes written",
+		    "hiding write timeout to %jd.%jd for %ju bytes written",
 		    (uintptr_t)xfer, curlwp->l_proc->p_pid, curlwp->l_lid,
 		    xfer->ux_length);
 

--- src/sys/dev/usb/if_aue.c.orig	2020-03-13 23:49:24.716319736 +0000
+++ src/sys/dev/usb/if_aue.c	2020-03-14 00:23:04.916166672 +0000
@@ -330,7 +330,7 @@ aue_csr_read_2(struct aue_softc *sc, int
 
 	if (err) {
 		AUEHIST_FUNC();
-		AUEHIST_CALLARGS("auw%jd: reg=%#jx err=%jd",
+		AUEHIST_CALLARGS("aue%jd: reg=%#jx err=%jd",
 		    device_unit(un->un_dev), reg, err, 0);
 		return 0;
 	}
@@ -362,7 +362,7 @@ aue_csr_write_1(struct aue_softc *sc, in
 
 	if (err) {
 		AUEHIST_FUNC();
-		AUEHIST_CALLARGS("%jd: reg=%#jx err=%jd",
+		AUEHIST_CALLARGS("aue%jd: reg=%#jx err=%jd",
 		    device_unit(un->un_dev), reg, err, 0);
 		return -1;
 	}
@@ -533,7 +533,7 @@ aue_mii_write_reg(struct usbnet *un, int
 	}
 
 	if (i == AUE_TIMEOUT) {
-		DPRINTF("%d: phy=%#jx reg=%#jx val=%#jx write timed out",
+		DPRINTF("aue%d: 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, "%d: exit link %d",
+		DPRINTFN(5, "aue%d: exit link %d",
 		    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, "%d: exit", device_unit(un->un_dev), 0, 0, 0);
+	DPRINTFN(2, "aue%d: 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, "%d: send %d bytes",
+	DPRINTFN(5, "aue%d: send %d bytes",
 	    device_unit(un->un_dev), total_len, 0, 0);
 
 	return total_len;