[src/netbsd-7-nhusb]: src/sys/dev/usb KNF

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

details:   https://anonhg.NetBSD.org/src/rev/48e6190be338
branches:  netbsd-7-nhusb
changeset: 801042:48e6190be338
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Mar 31 09:38:05 2017 +0000

description:
KNF

diffstat:

 sys/dev/usb/auvitek_video.c |   6 +++---
 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/udsir.c         |  12 ++++++------
 sys/dev/usb/uhso.c          |   6 +++---
 sys/dev/usb/ukyopon.c       |  10 +++++-----
 sys/dev/usb/usbdi_util.c    |   8 ++++----
 sys/dev/usb/uslsa.c         |   6 +++---
 sys/dev/usb/uyap.c          |  10 +++++-----
 sys/dev/usb/uyurex.c        |  10 +++++-----
 13 files changed, 54 insertions(+), 54 deletions(-)

diffs (truncated from 464 to 300 lines):

diff -r 4e1b66d15eae -r 48e6190be338 sys/dev/usb/auvitek_video.c
--- a/sys/dev/usb/auvitek_video.c       Fri Mar 31 08:55:41 2017 +0000
+++ b/sys/dev/usb/auvitek_video.c       Fri Mar 31 09:38:05 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_video.c,v 1.6.36.1 2016/09/06 20:33:08 skrll Exp $ */
+/* $NetBSD: auvitek_video.c,v 1.6.36.2 2017/03/31 09:38:05 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.6.36.1 2016/09/06 20:33:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.6.36.2 2017/03/31 09:38:05 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 4e1b66d15eae -r 48e6190be338 sys/dev/usb/slurm.c
--- a/sys/dev/usb/slurm.c       Fri Mar 31 08:55:41 2017 +0000
+++ b/sys/dev/usb/slurm.c       Fri Mar 31 09:38:05 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: slurm.c,v 1.1.22.1 2016/09/06 20:33:09 skrll Exp $ */
+/*     $NetBSD: slurm.c,v 1.1.22.2 2017/03/31 09:38:05 skrll Exp $ */
 
 /*
  * Copyright (c) 2012 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.1.22.1 2016/09/06 20:33:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.1.22.2 2017/03/31 09:38:05 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 4e1b66d15eae -r 48e6190be338 sys/dev/usb/uark.c
--- a/sys/dev/usb/uark.c        Fri Mar 31 08:55:41 2017 +0000
+++ b/sys/dev/usb/uark.c        Fri Mar 31 09:38:05 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uark.c,v 1.6.18.2 2017/01/26 21:54:24 skrll Exp $      */
+/*     $NetBSD: uark.c,v 1.6.18.3 2017/03/31 09:38:05 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.6.18.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.6.18.3 2017/03/31 09:38:05 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 4e1b66d15eae -r 48e6190be338 sys/dev/usb/uatp.c
--- a/sys/dev/usb/uatp.c        Fri Mar 31 08:55:41 2017 +0000
+++ b/sys/dev/usb/uatp.c        Fri Mar 31 09:38:05 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uatp.c,v 1.10.2.1.4.2 2017/01/26 21:54:24 skrll Exp $  */
+/*     $NetBSD: uatp.c,v 1.10.2.1.4.3 2017/03/31 09:38:05 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.10.2.1.4.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.10.2.1.4.3 2017/03/31 09:38:05 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -834,7 +834,7 @@
 
        product = (delta * ((int) (*multiplier)));
        *remainder = (product % ((int) (*divisor)));
-       return (product / ((int) (*divisor)));
+       return product / ((int) (*divisor));
 }
 
 static int
@@ -2627,7 +2627,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 4e1b66d15eae -r 48e6190be338 sys/dev/usb/uberry.c
--- a/sys/dev/usb/uberry.c      Fri Mar 31 08:55:41 2017 +0000
+++ b/sys/dev/usb/uberry.c      Fri Mar 31 09:38:05 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uberry.c,v 1.9.18.2 2017/01/26 21:54:24 skrll Exp $    */
+/*     $NetBSD: uberry.c,v 1.9.18.3 2017/03/31 09:38:05 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.9.18.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.9.18.3 2017/03/31 09:38:05 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 4e1b66d15eae -r 48e6190be338 sys/dev/usb/ubsa.c
--- a/sys/dev/usb/ubsa.c        Fri Mar 31 08:55:41 2017 +0000
+++ b/sys/dev/usb/ubsa.c        Fri Mar 31 09:38:05 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubsa.c,v 1.30.20.2 2017/01/26 21:54:24 skrll Exp $     */
+/*     $NetBSD: ubsa.c,v 1.30.20.3 2017/03/31 09:38:05 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.30.20.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.30.20.3 2017/03/31 09:38:05 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 4e1b66d15eae -r 48e6190be338 sys/dev/usb/udsir.c
--- a/sys/dev/usb/udsir.c       Fri Mar 31 08:55:41 2017 +0000
+++ b/sys/dev/usb/udsir.c       Fri Mar 31 09:38:05 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udsir.c,v 1.1.18.1 2016/09/06 20:33:09 skrll Exp $     */
+/*     $NetBSD: udsir.c,v 1.1.18.2 2017/03/31 09:38:05 skrll Exp $     */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.18.1 2016/09/06 20:33:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.18.2 2017/03/31 09:38:05 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -689,7 +689,7 @@
                kn->kn_fop = &udsirwrite_filtops;
                break;
        default:
-               return (EINVAL);
+               return EINVAL;
        }
 
        kn->kn_hook = sc;
@@ -698,7 +698,7 @@
        SLIST_INSERT_HEAD(klist, kn, kn_selnext);
        splx(s);
 
-       return (0);
+       return 0;
 }
 
 static int
@@ -779,7 +779,7 @@
        struct udsir_softc *sc = kn->kn_hook;
 
        kn->kn_data = sc->sc_ur_framelen;
-       return (kn->kn_data > 0);
+       return kn->kn_data > 0;
 }
 
 static void
@@ -800,7 +800,7 @@
        struct udsir_softc *sc = kn->kn_hook;
 
        kn->kn_data = 0;
-       return (sc->sc_direction != udir_input);
+       return sc->sc_direction != udir_input;
 }
 
 
diff -r 4e1b66d15eae -r 48e6190be338 sys/dev/usb/uhso.c
--- a/sys/dev/usb/uhso.c        Fri Mar 31 08:55:41 2017 +0000
+++ b/sys/dev/usb/uhso.c        Fri Mar 31 09:38:05 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhso.c,v 1.16.6.2 2017/01/26 21:54:24 skrll Exp $      */
+/*     $NetBSD: uhso.c,v 1.16.6.3 2017/03/31 09:38:05 skrll Exp $      */
 
 /*-
  * Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.16.6.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.16.6.3 2017/03/31 09:38:05 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 4e1b66d15eae -r 48e6190be338 sys/dev/usb/ukyopon.c
--- a/sys/dev/usb/ukyopon.c     Fri Mar 31 08:55:41 2017 +0000
+++ b/sys/dev/usb/ukyopon.c     Fri Mar 31 09:38:05 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ukyopon.c,v 1.16.20.2 2017/01/26 21:54:24 skrll Exp $  */
+/*     $NetBSD: ukyopon.c,v 1.16.20.3 2017/03/31 09:38:05 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.16.20.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.16.20.3 2017/03/31 09:38:05 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))