[src/netbsd-8]: src/sys/dev/usb use min() instead of uimin() - the latter doe...

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

details:   https://anonhg.NetBSD.org/src/rev/61dbfcc74bb2
branches:  netbsd-8
changeset: 466936:61dbfcc74bb2
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jan 05 15:11:29 2020 +0000

description:
use min() instead of uimin() - the latter does not exist on this branch.

diffstat:

 sys/dev/usb/uthum.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 61979a4e8b36 -r 61dbfcc74bb2 sys/dev/usb/uthum.c
--- a/sys/dev/usb/uthum.c       Thu Jan 02 09:55:10 2020 +0000
+++ b/sys/dev/usb/uthum.c       Sun Jan 05 15:11:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uthum.c,v 1.13.8.1 2020/01/02 09:43:56 martin Exp $   */
+/*     $NetBSD: uthum.c,v 1.13.8.2 2020/01/05 15:11:29 martin Exp $   */
 /*     $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $   */
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.13.8.1 2020/01/02 09:43:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.13.8.2 2020/01/05 15:11:29 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -267,7 +267,7 @@
        if ((buf == NULL) || len == 0)
                return 0;
 
-       olen = uimin(sc->sc_olen, sizeof(cmdbuf));
+       olen = min(sc->sc_olen, sizeof(cmdbuf));
 
        /* issue query */
        memset(cmdbuf, 0, sizeof(cmdbuf));
@@ -298,7 +298,7 @@
                tsleep(&sc->sc_sme, 0, "uthum", (need_delay*hz+999)/1000 + 1);
 
        /* get answer */
-       flen = uimin(sc->sc_flen, sizeof(report));
+       flen = min(sc->sc_flen, sizeof(report));
        if (uhidev_get_report(&sc->sc_hdev, UHID_FEATURE_REPORT,
            report, flen))
                return EIO;