Module Name: src
Committed By: skrll
Date: Sun Jan 29 15:58:14 UTC 2017
Modified Files:
src/sys/dev/usb [nick-nhusb]: auvitek_video.c if_run.c slurm.c uark.c
uatp.c uberry.c ubsa.c udsir.c uhso.c ukyopon.c usbdi_util.c
uslsa.c uyap.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.6.32.5 -r1.6.32.6 src/sys/dev/usb/auvitek_video.c
cvs rdiff -u -r1.10.6.12 -r1.10.6.13 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.1.18.5 -r1.1.18.6 src/sys/dev/usb/slurm.c
cvs rdiff -u -r1.6.14.8 -r1.6.14.9 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.10.4.8 -r1.10.4.9 src/sys/dev/usb/uatp.c
cvs rdiff -u -r1.9.14.5 -r1.9.14.6 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.30.16.9 -r1.30.16.10 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.1.14.10 -r1.1.14.11 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.17.2.12 -r1.17.2.13 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.16.16.8 -r1.16.16.9 src/sys/dev/usb/ukyopon.c
cvs rdiff -u -r1.63.2.14 -r1.63.2.15 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.19.6.6 -r1.19.6.7 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.19.24.4 -r1.19.24.5 src/sys/dev/usb/uyap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/auvitek_video.c
diff -u src/sys/dev/usb/auvitek_video.c:1.6.32.5 src/sys/dev/usb/auvitek_video.c:1.6.32.6
--- src/sys/dev/usb/auvitek_video.c:1.6.32.5 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/auvitek_video.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_video.c,v 1.6.32.5 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: auvitek_video.c,v 1.6.32.6 2017/01/29 15:58:14 skrll Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.6.32.5 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.6.32.6 2017/01/29 15:58:14 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -134,7 +134,7 @@ auvitek_video_attach(struct auvitek_soft
auvitek_video_rescan(sc, NULL, NULL);
- return (sc->sc_videodev != NULL);
+ return sc->sc_videodev != NULL;
}
int
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.10.6.12 src/sys/dev/usb/if_run.c:1.10.6.13
--- src/sys/dev/usb/if_run.c:1.10.6.12 Mon Dec 5 10:55:18 2016
+++ src/sys/dev/usb/if_run.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_run.c,v 1.10.6.12 2016/12/05 10:55:18 skrll Exp $ */
+/* $NetBSD: if_run.c,v 1.10.6.13 2017/01/29 15:58:14 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.10.6.12 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.10.6.13 2017/01/29 15:58:14 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1110,7 +1110,7 @@ run_efuse_read(struct run_softc *sc, uin
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
@@ -4100,7 +4100,7 @@ run_rt3593_rf_init(struct run_softc *sc)
run_read(sc, RT3070_OPT_14, &tmp);
run_write(sc, RT3070_OPT_14, tmp | 1);
- return (0);
+ return 0;
}
static int
@@ -4165,7 +4165,7 @@ run_rt5390_rf_init(struct run_softc *sc)
run_read(sc, RT3070_OPT_14, &tmp);
run_write(sc, RT3070_OPT_14, tmp | 1);
- return (0);
+ return 0;
}
static int
@@ -4486,7 +4486,7 @@ run_adjust_freq_offset(struct run_softc
if (tmp != rf)
run_mcu_cmd(sc, 0x74, (tmp << 8 ) | rf);
- return (0);
+ return 0;
}
static int
Index: src/sys/dev/usb/slurm.c
diff -u src/sys/dev/usb/slurm.c:1.1.18.5 src/sys/dev/usb/slurm.c:1.1.18.6
--- src/sys/dev/usb/slurm.c:1.1.18.5 Sat Jul 9 20:25:16 2016
+++ src/sys/dev/usb/slurm.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: slurm.c,v 1.1.18.5 2016/07/09 20:25:16 skrll Exp $ */
+/* $NetBSD: slurm.c,v 1.1.18.6 2017/01/29 15:58:14 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.18.5 2016/07/09 20:25:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.1.18.6 2017/01/29 15:58:14 skrll Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -156,7 +156,7 @@ slurm_detach(device_t self, int flags)
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
- return (rv);
+ return rv;
}
static int
Index: src/sys/dev/usb/uark.c
diff -u src/sys/dev/usb/uark.c:1.6.14.8 src/sys/dev/usb/uark.c:1.6.14.9
--- src/sys/dev/usb/uark.c:1.6.14.8 Mon Dec 5 10:55:18 2016
+++ src/sys/dev/usb/uark.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uark.c,v 1.6.14.8 2016/12/05 10:55:18 skrll Exp $ */
+/* $NetBSD: uark.c,v 1.6.14.9 2017/01/29 15:58:14 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.14.8 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.6.14.9 2017/01/29 15:58:14 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -229,7 +229,7 @@ uark_activate(device_t self, enum devact
sc->sc_dying = 1;
break;
}
- return (rv);
+ return rv;
}
void
@@ -272,7 +272,7 @@ uark_param(void *vsc, int portno, struct
uark_cmd(sc, 3, 0x03);
break;
default:
- return (EINVAL);
+ return EINVAL;
}
if (ISSET(t->c_cflag, CSTOPB))
@@ -317,7 +317,7 @@ uark_param(void *vsc, int portno, struct
}
#endif
- return (0);
+ return 0;
}
void
@@ -363,7 +363,7 @@ uark_cmd(struct uark_softc *sc, uint16_t
err = usbd_do_request(sc->sc_udev, &req, NULL);
if (err)
- return (EIO);
+ return EIO;
- return (0);
+ return 0;
}
Index: src/sys/dev/usb/uatp.c
diff -u src/sys/dev/usb/uatp.c:1.10.4.8 src/sys/dev/usb/uatp.c:1.10.4.9
--- src/sys/dev/usb/uatp.c:1.10.4.8 Mon Dec 5 10:55:18 2016
+++ src/sys/dev/usb/uatp.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uatp.c,v 1.10.4.8 2016/12/05 10:55:18 skrll Exp $ */
+/* $NetBSD: uatp.c,v 1.10.4.9 2017/01/29 15:58:14 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.4.8 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.10.4.9 2017/01/29 15:58:14 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -834,7 +834,7 @@ scale_motion(const struct uatp_softc *sc
product = (delta * ((int) (*multiplier)));
*remainder = (product % ((int) (*divisor)));
- return (product / ((int) (*divisor)));
+ return product / ((int) (*divisor));
}
static int
@@ -2627,7 +2627,7 @@ motion_below_threshold(struct uatp_softc
x_squared = (x * x);
y_squared = (y * y);
- return ((x_squared + y_squared) < threshold);
+ return (x_squared + y_squared) < threshold;
}
static int
Index: src/sys/dev/usb/uberry.c
diff -u src/sys/dev/usb/uberry.c:1.9.14.5 src/sys/dev/usb/uberry.c:1.9.14.6
--- src/sys/dev/usb/uberry.c:1.9.14.5 Mon Dec 5 10:55:18 2016
+++ src/sys/dev/usb/uberry.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uberry.c,v 1.9.14.5 2016/12/05 10:55:18 skrll Exp $ */
+/* $NetBSD: uberry.c,v 1.9.14.6 2017/01/29 15:58:14 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.14.5 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.9.14.6 2017/01/29 15:58:14 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -209,5 +209,5 @@ uberry_detach(device_t self, int flags)
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
- return (0);
+ return 0;
}
Index: src/sys/dev/usb/ubsa.c
diff -u src/sys/dev/usb/ubsa.c:1.30.16.9 src/sys/dev/usb/ubsa.c:1.30.16.10
--- src/sys/dev/usb/ubsa.c:1.30.16.9 Mon Dec 5 10:55:18 2016
+++ src/sys/dev/usb/ubsa.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.30.16.9 2016/12/05 10:55:18 skrll Exp $ */
+/* $NetBSD: ubsa.c,v 1.30.16.10 2017/01/29 15:58:14 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.16.9 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.30.16.10 2017/01/29 15:58:14 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -341,7 +341,7 @@ ubsa_detach(device_t self, int flags)
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
- return (rv);
+ return rv;
}
int
Index: src/sys/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.1.14.10 src/sys/dev/usb/udsir.c:1.1.14.11
--- src/sys/dev/usb/udsir.c:1.1.14.10 Sat Jul 9 20:25:16 2016
+++ src/sys/dev/usb/udsir.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: udsir.c,v 1.1.14.10 2016/07/09 20:25:16 skrll Exp $ */
+/* $NetBSD: udsir.c,v 1.1.14.11 2017/01/29 15:58:14 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.14.10 2016/07/09 20:25:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.14.11 2017/01/29 15:58:14 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -689,7 +689,7 @@ udsir_kqfilter(void *h, struct knote *kn
kn->kn_fop = &udsirwrite_filtops;
break;
default:
- return (EINVAL);
+ return EINVAL;
}
kn->kn_hook = sc;
@@ -698,7 +698,7 @@ udsir_kqfilter(void *h, struct knote *kn
SLIST_INSERT_HEAD(klist, kn, kn_selnext);
splx(s);
- return (0);
+ return 0;
}
static int
@@ -779,7 +779,7 @@ filt_udsirread(struct knote *kn, long hi
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 @@ filt_udsirwrite(struct knote *kn, long h
struct udsir_softc *sc = kn->kn_hook;
kn->kn_data = 0;
- return (sc->sc_direction != udir_input);
+ return sc->sc_direction != udir_input;
}
Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.17.2.12 src/sys/dev/usb/uhso.c:1.17.2.13
--- src/sys/dev/usb/uhso.c:1.17.2.12 Mon Dec 5 10:55:18 2016
+++ src/sys/dev/usb/uhso.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.17.2.12 2016/12/05 10:55:18 skrll Exp $ */
+/* $NetBSD: uhso.c,v 1.17.2.13 2017/01/29 15:58:14 skrll Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.17.2.12 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.17.2.13 2017/01/29 15:58:14 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -625,7 +625,7 @@ uhso_switch_mode(struct usbd_device *ude
usbd_destroy_xfer(xfer);
usbd_close_pipe(pipe);
- return (status == USBD_NORMAL_COMPLETION ? 0 : EIO);
+ return status == USBD_NORMAL_COMPLETION ? 0 : EIO;
}
Static int
Index: src/sys/dev/usb/ukyopon.c
diff -u src/sys/dev/usb/ukyopon.c:1.16.16.8 src/sys/dev/usb/ukyopon.c:1.16.16.9
--- src/sys/dev/usb/ukyopon.c:1.16.16.8 Mon Dec 5 10:55:18 2016
+++ src/sys/dev/usb/ukyopon.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ukyopon.c,v 1.16.16.8 2016/12/05 10:55:18 skrll Exp $ */
+/* $NetBSD: ukyopon.c,v 1.16.16.9 2017/01/29 15:58:14 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.16.8 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.16.16.9 2017/01/29 15:58:14 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -117,9 +117,9 @@ ukyopon_match(device_t parent, cfdata_t
uiaa->uiaa_product == USB_PRODUCT_KYOCERA_AHK3001V &&
(uiaa->uiaa_ifaceno == UKYOPON_MODEM_IFACE_INDEX ||
uiaa->uiaa_ifaceno == UKYOPON_DATA_IFACE_INDEX))
- return (UMATCH_VENDOR_PRODUCT);
+ return UMATCH_VENDOR_PRODUCT;
- return (UMATCH_NONE);
+ return UMATCH_NONE;
}
void
@@ -178,7 +178,7 @@ ukyopon_ioctl(void *addr, int portno, u_
break;
}
- return (error);
+ return error;
}
int
Index: src/sys/dev/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.63.2.14 src/sys/dev/usb/usbdi_util.c:1.63.2.15
--- src/sys/dev/usb/usbdi_util.c:1.63.2.14 Thu Oct 27 07:46:19 2016
+++ src/sys/dev/usb/usbdi_util.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.c,v 1.63.2.14 2016/10/27 07:46:19 skrll Exp $ */
+/* $NetBSD: usbdi_util.c,v 1.63.2.15 2017/01/29 15:58:14 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.14 2016/10/27 07:46:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.15 2017/01/29 15:58:14 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -112,7 +112,7 @@ usbd_get_bos_desc(struct usbd_device *de
err = usbd_get_desc(dev, UDESC_BOS, confidx,
USB_BOS_DESCRIPTOR_SIZE, d);
if (err)
- return (err);
+ return err;
if (d->bDescriptorType != UDESC_BOS) {
DPRINTFN(1, "confidx=%d, bad desc len=%d type=%d",
confidx, d->bLength, d->bDescriptorType, 0);
@@ -212,7 +212,7 @@ usbd_get_port_status_ext(struct usbd_dev
USETW2(req.wValue, 0, UR_PST_EXT_PORT_STATUS);
USETW(req.wIndex, port);
USETW(req.wLength, sizeof(*pse));
- return (usbd_do_request(dev, &req, pse));
+ return usbd_do_request(dev, &req, pse);
}
usbd_status
Index: src/sys/dev/usb/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.19.6.6 src/sys/dev/usb/uslsa.c:1.19.6.7
--- src/sys/dev/usb/uslsa.c:1.19.6.6 Mon Dec 5 10:55:20 2016
+++ src/sys/dev/usb/uslsa.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.19.6.6 2016/12/05 10:55:20 skrll Exp $ */
+/* $NetBSD: uslsa.c,v 1.19.6.7 2017/01/29 15:58:14 skrll Exp $ */
/* from ugensa.c */
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.19.6.6 2016/12/05 10:55:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.19.6.7 2017/01/29 15:58:14 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -283,7 +283,7 @@ uslsa_detach(device_t self, int flags)
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
- return (rv);
+ return rv;
}
static int
Index: src/sys/dev/usb/uyap.c
diff -u src/sys/dev/usb/uyap.c:1.19.24.4 src/sys/dev/usb/uyap.c:1.19.24.5
--- src/sys/dev/usb/uyap.c:1.19.24.4 Wed Oct 5 20:55:59 2016
+++ src/sys/dev/usb/uyap.c Sun Jan 29 15:58:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uyap.c,v 1.19.24.4 2016/10/05 20:55:59 skrll Exp $ */
+/* $NetBSD: uyap.c,v 1.19.24.5 2017/01/29 15:58:14 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.19.24.4 2016/10/05 20:55:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.19.24.5 2017/01/29 15:58:14 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,9 +69,9 @@ uyap_match(device_t parent, cfdata_t mat
/* Match the boot device. */
if (uaa->uaa_vendor == USB_VENDOR_SILICONPORTALS &&
uaa->uaa_product == USB_PRODUCT_SILICONPORTALS_YAPPH_NF)
- return (UMATCH_VENDOR_PRODUCT);
+ return UMATCH_VENDOR_PRODUCT;
- return (UMATCH_NONE);
+ return UMATCH_NONE;
}
void
@@ -113,7 +113,7 @@ uyap_detach(device_t self, int flags)
struct uyap_softc *sc = device_private(self);
#endif
- return (0);
+ return 0;
}
int
