[src/trunk]: src/sys/dev/usb fix more kernhist vs 32 bit issues.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/764f112395c7
branches:  trunk
changeset: 964911:764f112395c7
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Aug 22 07:38:06 2019 +0000

description:
fix more kernhist vs 32 bit issues.

diffstat:

 sys/dev/usb/if_aue.c |  22 +++++++++++-----------
 sys/dev/usb/usbdi.c  |   6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diffs (98 lines):

diff -r 9095b9fe48e4 -r 764f112395c7 sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c      Thu Aug 22 04:25:38 2019 +0000
+++ b/sys/dev/usb/if_aue.c      Thu Aug 22 07:38:06 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_aue.c,v 1.158 2019/08/22 00:25:18 mrg Exp $ */
+/*     $NetBSD: if_aue.c,v 1.159 2019/08/22 07:38:06 mrg Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.158 2019/08/22 00:25:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.159 2019/08/22 07:38:06 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -317,8 +317,8 @@
 
        if (err) {
                AUEHIST_FUNC();
-               AUEHIST_CALLARGS("%d: aue_csr_read_1: reg=%#x err=%#s",
-                   device_unit(sc->aue_dev), reg, usbd_errstr(err), 0);
+               AUEHIST_CALLARGS("%d: aue_csr_read_1: reg=%#x err=%d",
+                   device_unit(sc->aue_dev), reg, err, 0);
                return 0;
        }
 
@@ -345,8 +345,8 @@
 
        if (err) {
                AUEHIST_FUNC();
-               AUEHIST_CALLARGS("%d: aue_csr_read_2: reg=%#x err=%s",
-                   device_unit(sc->aue_dev), reg, usbd_errstr(err), 0);
+               AUEHIST_CALLARGS("%d: aue_csr_read_2: reg=%#x err=%d",
+                   device_unit(sc->aue_dev), reg, err, 0);
                return 0;
        }
 
@@ -374,8 +374,8 @@
 
        if (err) {
                AUEHIST_FUNC();
-               AUEHIST_CALLARGS("%d: aue_csr_write_1: reg=%#x err=%s",
-                   device_unit(sc->aue_dev), reg, usbd_errstr(err), 0);
+               AUEHIST_CALLARGS("%d: aue_csr_write_1: reg=%#x err=%d",
+                   device_unit(sc->aue_dev), reg, err, 0);
                return -1;
        }
 
@@ -403,8 +403,8 @@
 
        if (err) {
                AUEHIST_FUNC();
-               AUEHIST_CALLARGS("%s: aue_csr_write_2: reg=%#x err=%s",
-                   device_unit(sc->aue_dev), reg, usbd_errstr(err), 0);
+               AUEHIST_CALLARGS("%s: aue_csr_write_2: reg=%#x err=%d",
+                   device_unit(sc->aue_dev), reg, err, 0);
                return -1;
        }
 
@@ -1362,7 +1362,7 @@
                if (mii->mii_media_status & IFM_ACTIVE &&
                    IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
                        DPRINTFN(2, "%d: got link",
-                           device_unit(sc->aue_dev), __func__, 0, 0);
+                           device_unit(sc->aue_dev), 0, 0, 0);
                        sc->aue_link++;
                        if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
                                aue_start(ifp);
diff -r 9095b9fe48e4 -r 764f112395c7 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Thu Aug 22 04:25:38 2019 +0000
+++ b/sys/dev/usb/usbdi.c       Thu Aug 22 07:38:06 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.183 2019/08/21 10:48:37 mrg Exp $  */
+/*     $NetBSD: usbdi.c,v 1.184 2019/08/22 07:38:06 mrg Exp $  */
 
 /*
  * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.183 2019/08/21 10:48:37 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.184 2019/08/22 07:38:06 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1105,7 +1105,7 @@
 
        USBHIST_FUNC();
        USBHIST_CALLARGS(usbdebug, "dev=%#jx req=%jx flgas=%jx len=%jx",
-           (uintptr_t)dev, (uintptr_t)req, flags, actlen);
+           (uintptr_t)dev, (uintptr_t)req, flags, *actlen);
 
        ASSERT_SLEEPABLE();