[src/trunk]: src/sys/dev/usb KNF

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

details:   https://anonhg.NetBSD.org/src/rev/fa19ffc936d3
branches:  trunk
changeset: 447717:fa19ffc936d3
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Jan 22 06:46:21 2019 +0000

description:
KNF

diffstat:

 sys/dev/usb/auvitek_video.c |   6 +++---
 sys/dev/usb/if_run.c        |  12 ++++++------
 sys/dev/usb/slurm.c         |   6 +++---
 sys/dev/usb/uark.c          |  14 +++++++-------
 sys/dev/usb/uatp.c          |   8 ++++----
 sys/dev/usb/uberry.c        |   6 +++---
 sys/dev/usb/ubsa.c          |   6 +++---
 sys/dev/usb/uhso.c          |   6 +++---
 sys/dev/usb/ukyopon.c       |  10 +++++-----
 sys/dev/usb/umass_isdata.c  |  14 +++++++-------
 sys/dev/usb/umass_scsipi.c  |  12 ++++++------
 sys/dev/usb/uslsa.c         |   6 +++---
 sys/dev/usb/uyap.c          |  10 +++++-----
 sys/dev/usb/uyurex.c        |  10 +++++-----
 14 files changed, 63 insertions(+), 63 deletions(-)

diffs (truncated from 511 to 300 lines):

diff -r 183093553b8b -r fa19ffc936d3 sys/dev/usb/auvitek_video.c
--- a/sys/dev/usb/auvitek_video.c       Tue Jan 22 06:42:33 2019 +0000
+++ b/sys/dev/usb/auvitek_video.c       Tue Jan 22 06:46:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_video.c,v 1.8 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: auvitek_video.c,v 1.9 2019/01/22 06:47:20 skrll Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.8 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.9 2019/01/22 06:47:20 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -134,7 +134,7 @@
 
        auvitek_video_rescan(sc, NULL, NULL);
 
-       return (sc->sc_videodev != NULL);
+       return sc->sc_videodev != NULL;
 }
 
 int
diff -r 183093553b8b -r fa19ffc936d3 sys/dev/usb/if_run.c
--- a/sys/dev/usb/if_run.c      Tue Jan 22 06:42:33 2019 +0000
+++ b/sys/dev/usb/if_run.c      Tue Jan 22 06:46:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_run.c,v 1.31 2018/11/29 18:53:42 jakllsch Exp $     */
+/*     $NetBSD: if_run.c,v 1.32 2019/01/22 06:47:20 skrll Exp $        */
 /*     $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.31 2018/11/29 18:53:42 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.32 2019/01/22 06:47:20 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1114,7 +1114,7 @@
 static int
 run_efuse_read_2(struct run_softc *sc, uint16_t addr, uint16_t *val)
 {
-       return (run_efuse_read(sc, addr, val, 2));
+       return run_efuse_read(sc, addr, val, 2);
 }
 
 static int
@@ -4104,7 +4104,7 @@
 
        run_read(sc, RT3070_OPT_14, &tmp);
        run_write(sc, RT3070_OPT_14, tmp | 1);
-       return (0);
+       return 0;
 }
 
 static int
@@ -4169,7 +4169,7 @@
 
        run_read(sc, RT3070_OPT_14, &tmp);
        run_write(sc, RT3070_OPT_14, tmp | 1);
-       return (0);
+       return 0;
 }
 
 static int
@@ -4490,7 +4490,7 @@
        if (tmp != rf)
                run_mcu_cmd(sc, 0x74, (tmp << 8 ) | rf);
 
-       return (0);
+       return 0;
 }
 
 static int
diff -r 183093553b8b -r fa19ffc936d3 sys/dev/usb/slurm.c
--- a/sys/dev/usb/slurm.c       Tue Jan 22 06:42:33 2019 +0000
+++ b/sys/dev/usb/slurm.c       Tue Jan 22 06:46:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: slurm.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $ */
+/*     $NetBSD: slurm.c,v 1.4 2019/01/22 06:47:20 skrll Exp $ */
 
 /*
  * Copyright (c) 2012 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.4 2019/01/22 06:47:20 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -156,7 +156,7 @@
 
        usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
 
-       return (rv);
+       return rv;
 }
 
 static int
diff -r 183093553b8b -r fa19ffc936d3 sys/dev/usb/uark.c
--- a/sys/dev/usb/uark.c        Tue Jan 22 06:42:33 2019 +0000
+++ b/sys/dev/usb/uark.c        Tue Jan 22 06:46:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uark.c,v 1.11 2016/11/25 12:56:29 skrll Exp $  */
+/*     $NetBSD: uark.c,v 1.12 2019/01/22 06:47:20 skrll Exp $  */
 /*     $OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $       */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.11 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.12 2019/01/22 06:47:20 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -229,7 +229,7 @@
                sc->sc_dying = 1;
                break;
        }
-       return (rv);
+       return rv;
 }
 
 void
@@ -272,7 +272,7 @@
                uark_cmd(sc, 3, 0x03);
                break;
        default:
-               return (EINVAL);
+               return EINVAL;
        }
 
        if (ISSET(t->c_cflag, CSTOPB))
@@ -317,7 +317,7 @@
        }
 #endif
 
-       return (0);
+       return 0;
 }
 
 void
@@ -363,7 +363,7 @@
        err = usbd_do_request(sc->sc_udev, &req, NULL);
 
        if (err)
-               return (EIO);
+               return EIO;
 
-       return (0);
+       return 0;
 }
diff -r 183093553b8b -r fa19ffc936d3 sys/dev/usb/uatp.c
--- a/sys/dev/usb/uatp.c        Tue Jan 22 06:42:33 2019 +0000
+++ b/sys/dev/usb/uatp.c        Tue Jan 22 06:46:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uatp.c,v 1.18 2018/09/03 16:29:33 riastradh Exp $      */
+/*     $NetBSD: uatp.c,v 1.19 2019/01/22 06:47:20 skrll Exp $  */
 
 /*-
  * Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.18 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.19 2019/01/22 06:47:20 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -833,7 +833,7 @@
 
        product = (delta * ((int) (*multiplier)));
        *remainder = (product % ((int) (*divisor)));
-       return (product / ((int) (*divisor)));
+       return product / ((int) (*divisor));
 }
 
 static int
@@ -2614,7 +2614,7 @@
        x_squared = (x * x);
        y_squared = (y * y);
 
-       return ((x_squared + y_squared) < threshold);
+       return (x_squared + y_squared) < threshold;
 }
 
 static int
diff -r 183093553b8b -r fa19ffc936d3 sys/dev/usb/uberry.c
--- a/sys/dev/usb/uberry.c      Tue Jan 22 06:42:33 2019 +0000
+++ b/sys/dev/usb/uberry.c      Tue Jan 22 06:46:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uberry.c,v 1.12 2016/12/04 10:12:35 skrll Exp $        */
+/*     $NetBSD: uberry.c,v 1.13 2019/01/22 06:47:20 skrll Exp $        */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.12 2016/12/04 10:12:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.13 2019/01/22 06:47:20 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -209,5 +209,5 @@
 
        usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
 
-       return (0);
+       return 0;
 }
diff -r 183093553b8b -r fa19ffc936d3 sys/dev/usb/ubsa.c
--- a/sys/dev/usb/ubsa.c        Tue Jan 22 06:42:33 2019 +0000
+++ b/sys/dev/usb/ubsa.c        Tue Jan 22 06:46:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubsa.c,v 1.34 2016/12/04 10:12:35 skrll Exp $  */
+/*     $NetBSD: ubsa.c,v 1.35 2019/01/22 06:47:20 skrll Exp $  */
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
  * All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.34 2016/12/04 10:12:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.35 2019/01/22 06:47:20 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -341,7 +341,7 @@
 
        usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
 
-       return (rv);
+       return rv;
 }
 
 int
diff -r 183093553b8b -r fa19ffc936d3 sys/dev/usb/uhso.c
--- a/sys/dev/usb/uhso.c        Tue Jan 22 06:42:33 2019 +0000
+++ b/sys/dev/usb/uhso.c        Tue Jan 22 06:46:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhso.c,v 1.28 2018/06/26 06:48:02 msaitoh Exp $        */
+/*     $NetBSD: uhso.c,v 1.29 2019/01/22 06:47:20 skrll Exp $  */
 
 /*-
  * Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.28 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.29 2019/01/22 06:47:20 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -625,7 +625,7 @@
        usbd_destroy_xfer(xfer);
        usbd_close_pipe(pipe);
 
-       return (status == USBD_NORMAL_COMPLETION ? 0 : EIO);
+       return status == USBD_NORMAL_COMPLETION ? 0 : EIO;
 }
 
 Static int
diff -r 183093553b8b -r fa19ffc936d3 sys/dev/usb/ukyopon.c
--- a/sys/dev/usb/ukyopon.c     Tue Jan 22 06:42:33 2019 +0000
+++ b/sys/dev/usb/ukyopon.c     Tue Jan 22 06:46:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ukyopon.c,v 1.19 2016/11/25 12:56:29 skrll Exp $       */
+/*     $NetBSD: ukyopon.c,v 1.20 2019/01/22 06:47:20 skrll Exp $       */
 
 /*
  * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.19 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.20 2019/01/22 06:47:20 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -117,9 +117,9 @@
            uiaa->uiaa_product == USB_PRODUCT_KYOCERA_AHK3001V &&
            (uiaa->uiaa_ifaceno == UKYOPON_MODEM_IFACE_INDEX ||
             uiaa->uiaa_ifaceno == UKYOPON_DATA_IFACE_INDEX))