 @@ -1,14 +1,14 @@
-/* $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 <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Auvitek AU0828 USB controller
  */
 #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>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 @@ -124,27 +124,27 @@ static const struct video_hw_if auvitek_
 	.set_input = auvitek_set_input,
 	.get_frequency = auvitek_get_frequency,
 	.set_frequency = auvitek_set_frequency,
 };
 int
 auvitek_video_attach(struct auvitek_softc *sc)
+{
 	snprintf(sc->sc_businfo, sizeof(sc->sc_businfo), "usb:%08x",
 	    sc->sc_udev->ud_cookie.cookie);
 	auvitek_video_rescan(sc, NULL, NULL);
-	return (sc->sc_videodev != NULL);
+	return sc->sc_videodev != NULL;
+}
 int
 auvitek_video_detach(struct auvitek_softc *sc, int flags)
+{
 	if (sc->sc_videodev != NULL) {
 		config_detach(sc->sc_videodev, flags);
 		sc->sc_videodev = NULL;
+	}
 	return 0;
+}

 @@ -1,39 +1,39 @@
-/*	$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 $	*/
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*-
  * Ralink Technology RT2700U/RT2800U/RT3000U chipset driver.
  * http://www.ralinktech.com/
  */
 #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"
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 @@ -1100,27 +1100,27 @@ run_efuse_read(struct run_softc *sc, uin
 	/* determine to which 32-bit register our 16-bit word belongs */
 	reg = RT3070_EFUSE_DATA3 - (addr & 0xc);
 	if ((error = run_read(sc, reg, &tmp)) != 0)
 		return error;
 	*val = (addr & 1) ? tmp >> 16 : tmp & 0xffff;
 	return 0;
+}
 /* Read 16-bit from eFUSE ROM for RT3xxxx. */
 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
 run_eeprom_read_2(struct run_softc *sc, uint16_t addr, uint16_t *val)
+{
 	usb_device_request_t req;
 	uint16_t tmp;
 	int error;
 	addr *= 2;
 	req.bmRequestType = UT_READ_VENDOR_DEVICE;
 	req.bRequest = RT2870_EEPROM_READ;
 	USETW(req.wValue, 0);
 @@ -4090,27 +4090,27 @@ run_rt3593_rf_init(struct run_softc *sc)
 	usbd_delay_ms(sc->sc_udev, 1);
 	tmp = (tmp & ~0x1f000000) | 0x01000000;
 	run_write(sc, RT3070_LDO_CFG0, tmp);
 	sc->rf24_20mhz = 0x1f;
 	sc->rf24_40mhz = 0x2f;
 	/* Save default BBP registers 25 and 26 values. */
 	run_bbp_read(sc, 25, &sc->bbp25);
 	run_bbp_read(sc, 26, &sc->bbp26);
 	run_read(sc, RT3070_OPT_14, &tmp);
 	run_write(sc, RT3070_OPT_14, tmp | 1);
-	return (0);
+	return 0;
+}
 static int
 run_rt5390_rf_init(struct run_softc *sc)
+{
 	uint32_t tmp;
 	uint8_t rf;
 	int i;
 	/* Toggle RF R2 to initiate calibration. */
 	if (sc->mac_ver == 0x5390) {
 		run_rt3070_rf_read(sc, 2, &rf);
 		run_rt3070_rf_write(sc, 2, rf | RT5390_RESCAL);
 @@ -4155,27 +4155,27 @@ run_rt5390_rf_init(struct run_softc *sc)
 			run_rt3070_rf_write(sc, 56, 0x42);
 			run_rt3070_rf_write(sc, 61, 0xd1);
+		}
+	}
 	sc->rf24_20mhz = 0x1f;  /* default value */
 	sc->rf24_40mhz = (sc->mac_ver == 0x5592) ? 0 : 0x2f;
 	if (sc->mac_rev < 0x0211)
 		run_rt3070_rf_write(sc, 27, 0x3);
 	run_read(sc, RT3070_OPT_14, &tmp);
 	run_write(sc, RT3070_OPT_14, tmp | 1);
-	return (0);
+	return 0;
+}
 static int
 run_rt3070_filter_calib(struct run_softc *sc, uint8_t init, uint8_t target,
     uint8_t *val)
+{
 	uint8_t rf22, rf24;
 	uint8_t bbp55_pb, bbp55_sb, delta;
 	int ntries;
 	/* program filter */
 	run_rt3070_rf_read(sc, 24, &rf24);
 	rf24 = (rf24 & 0xc0) | init;    /* initial filter value */
 @@ -4476,27 +4476,27 @@ run_txrx_enable(struct run_softc *sc)
 static int
 run_adjust_freq_offset(struct run_softc *sc)
+{
 	uint8_t rf, tmp;
 	run_rt3070_rf_read(sc, 17, &rf);
 	tmp = rf;
 	rf = (rf & ~0x7f) | (sc->freq & 0x7f);
 	rf = MIN(rf, 0x5f);
 	if (tmp != rf)
 		run_mcu_cmd(sc, 0x74, (tmp << 8 ) | rf);
-	return (0);
+	return 0;
+}
 static int
 run_init(struct ifnet *ifp)
+{
 	struct run_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	uint32_t tmp;
 	uint8_t bbp1, bbp3;
 	int i, error, qid, ridx, ntries;
 	for (ntries = 0; ntries < 100; ntries++) {
 		if ((error = run_read(sc, RT2860_ASIC_VER_ID, &tmp)) != 0)

 @@ -1,14 +1,14 @@
-/*	$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
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 @@ -146,27 +146,27 @@ slurm_attach(device_t parent, device_t s
+}
 static int
 slurm_detach(device_t self, int flags)
+{
 	struct slurm_softc * const sc = device_private(self);
 	int rv = 0;
 	if ((rv = config_detach_children(self, flags)) != 0)
 		return rv;
 	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
-	return (rv);
+	return rv;
+}
 static int
 slurm_get_info(void *v, struct radio_info *ri)
+{
 	struct slurm_softc * const sc = v;
 	uint16_t powercfg, sysconfig2, readchannel, statusrssi;
 	slurm_getreg(sc, SI470X_POWERCFG, &powercfg);
 	slurm_getreg(sc, SI470X_SYSCONFIG2, &sysconfig2);
 	slurm_getreg(sc, SI470X_STATUSRSSI, &statusrssi);
 	slurm_getreg(sc, SI470X_READCHANNEL, &readchannel);

 @@ -1,34 +1,34 @@
-/*	$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 $	*/
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #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"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/device.h>
 #include <dev/usb/usb.h>
 @@ -219,27 +219,27 @@ uark_detach(device_t self, int flags)
 int
 uark_activate(device_t self, enum devact act)
+{
 	struct uark_softc *sc = device_private(self);
 	int rv = 0;
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		if (sc->sc_subdev != NULL)
 			rv = config_deactivate(sc->sc_subdev);
 		sc->sc_dying = 1;
 		break;
+	}
-	return (rv);
+	return rv;
+}
 void
 uark_set(void *vsc, int portno, int reg, int onoff)
+{
 	struct uark_softc *sc = vsc;
 	switch (reg) {
 	case UCOM_SET_BREAK:
 		uark_break(sc, portno, onoff);
 		return;
 	case UCOM_SET_DTR:
 	case UCOM_SET_RTS:
 @@ -262,27 +262,27 @@ uark_param(void *vsc, int portno, struct
 	case 2400:
 	case 4800:
 	case 9600:
 	case 19200:
 	case 38400:
 	case 57600:
 	case 115200:
 		uark_cmd(sc, 3, 0x83);
 		uark_cmd(sc, 0, (UARK_BAUD_REF / t->c_ospeed) & 0xFF);
 		uark_cmd(sc, 1, (UARK_BAUD_REF / t->c_ospeed) >> 8);
 		uark_cmd(sc, 3, 0x03);
 		break;
 	default:
-		return (EINVAL);
+		return EINVAL;
+	}
 	if (ISSET(t->c_cflag, CSTOPB))
 		data = UARK_STOP_BITS_2;
 	else
 		data = UARK_STOP_BITS_1;
 	if (ISSET(t->c_cflag, PARENB)) {
 		if (ISSET(t->c_cflag, PARODD))
 			data |= UARK_PARITY_ODD;
 		else
 			data |= UARK_PARITY_EVEN;
 	} else
 @@ -307,27 +307,27 @@ uark_param(void *vsc, int portno, struct
 	uark_cmd(sc, 3, data);
 #if 0
 	/* XXX flow control */
 	if (ISSET(t->c_cflag, CRTSCTS))
 		/*  rts/cts flow ctl */
 	} else if (ISSET(t->c_iflag, IXON|IXOFF)) {
 		/*  xon/xoff flow ctl */
 	} else {
 		/* disable flow ctl */
+	}
 #endif
-	return (0);
+	return 0;
+}
 void
 uark_get_status(void *vsc, int portno, u_char *lsr, u_char *msr)
+{
 	struct uark_softc *sc = vsc;
 	if (msr != NULL)
 		*msr = sc->sc_msr;
 	if (lsr != NULL)
 		*lsr = sc->sc_lsr;
+}
 @@ -353,17 +353,17 @@ int
 uark_cmd(struct uark_softc *sc, uint16_t index, uint16_t value)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	req.bmRequestType = UARK_WRITE;
 	req.bRequest = UARK_REQUEST;
 	USETW(req.wValue, value);
 	USETW(req.wIndex, index);
 	USETW(req.wLength, 0);
 	err = usbd_do_request(sc->sc_udev, &req, NULL);
 	if (err)
-		return (EIO);
+		return EIO;
-	return (0);
+	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -136,27 +136,27 @@
  * - What devices split packets in chunks?
  *     `partial packet: ... bytes'
+ *
  * - What devices develop large sensor readouts?
  *     `large sensor readout: ...'
+ *
  * - What devices have the wrong number of sensors?  Are there parts of
  *   your trackpad that the system doesn't seem to notice?  You can
  *   tweak hw.uatp0.x_sensors and hw.uatp0.y_sensors, up to a maximum
  *   of 32 for each value.
  */
 #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"
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 @@ -824,27 +824,27 @@ scale_motion(const struct uatp_softc *sc
 			    % ((int) (*divisor)))));
 	if (sc->sc_knobs.motion_remainder)
 		delta += *remainder;
 	*remainder = 0;
 	if (((*multiplier) == 0) ||
 	    ((*multiplier) > UATP_MAX_MOTION_MULTIPLIER) ||
 	    ((*divisor) == 0))
 		return delta;
 	product = (delta * ((int) (*multiplier)));
 	*remainder = (product % ((int) (*divisor)));
-	return (product / ((int) (*divisor)));
+	return product / ((int) (*divisor));
+}
 static int
 uatp_scale_motion(const struct uatp_softc *sc, int delta, int *remainder)
+{
 	return scale_motion(sc, delta, remainder,
 	    &sc->sc_knobs.motion_multiplier,
 	    &sc->sc_knobs.motion_divisor);
+}
 static int
 uatp_scale_fast_motion(const struct uatp_softc *sc, int delta, int *remainder)
+{
 @@ -2617,27 +2617,27 @@ motion_below_threshold(struct uatp_softc
+{
 	unsigned int x_squared, y_squared;
 	/* Caller guarantees the multiplication will not overflow.  */
 	KASSERT(-UATP_MAX_POSITION <= x);
 	KASSERT(-UATP_MAX_POSITION <= y);
 	KASSERT(x <= UATP_MAX_POSITION);
 	KASSERT(y <= UATP_MAX_POSITION);
 	__CTASSERT(0x12000000 == (2 * UATP_MAX_POSITION * UATP_MAX_POSITION));
 	x_squared = (x * x);
 	y_squared = (y * y);
-	return ((x_squared + y_squared) < threshold);
+	return (x_squared + y_squared) < threshold;
+}
 static int
 accelerate(struct uatp_softc *sc, unsigned int old_raw, unsigned int raw,
     unsigned int old_smoothed, unsigned int smoothed, bool fast,
     int *remainder)
+{
 #define CHECK_(condition) CHECK(condition, return 0)
 	/* Guarantee that the scaling won't overflow.  */
 	__CTASSERT(0x30000 ==
 	    (UATP_MAX_POSITION * UATP_MAX_MOTION_MULTIPLIER));

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/select.h>
 @@ -199,15 +199,15 @@ uberry_attach(device_t parent, device_t
 	return;
+}
 int
 uberry_detach(device_t self, int flags)
+{
 	struct uberry_softc *sc = device_private(self);
 	DPRINTF(("uberry_detach: sc=%p flags=%d\n", sc, flags));
 	pmf_device_deregister(self);
 	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
-	return (0);
+	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -44,27 +44,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/ioccom.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 @@ -331,27 +331,27 @@ ubsa_detach(device_t self, int flags)
 		usbd_close_pipe(sc->sc_intr_pipe);
 		kmem_free(sc->sc_intr_buf, sc->sc_isize);
 		sc->sc_intr_pipe = NULL;
+	}
 	sc->sc_dying = 1;
 	for (i = 0; i < sc->sc_numif; i++) {
 		if (sc->sc_subdevs[i] != NULL)
 			rv |= config_detach(sc->sc_subdevs[i], flags);
+	}
 	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
-	return (rv);
+	return rv;
+}
 int
 ubsa_activate(device_t self, enum devact act)
+{
 	struct ubsa_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		return 0;
 	default:
 		return EOPNOTSUPP;

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David Sainty <David.Sainty@dtsp.co.nz>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 @@ -679,36 +679,36 @@ udsir_kqfilter(void *h, struct knote *kn
 	struct klist *klist;
 	int s;
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
 		klist = &sc->sc_rd_sel.sel_klist;
 		kn->kn_fop = &udsirread_filtops;
 		break;
 	case EVFILT_WRITE:
 		klist = &sc->sc_wr_sel.sel_klist;
 		kn->kn_fop = &udsirwrite_filtops;
 		break;
 	default:
-		return (EINVAL);
+		return EINVAL;
+	}
 	kn->kn_hook = sc;
 	s = splusb();
 	SLIST_INSERT_HEAD(klist, kn, kn_selnext);
 	splx(s);
-	return (0);
+	return 0;
+}
 static int
 udsir_set_params(void *h, struct irda_params *p)
+{
 	struct udsir_softc *sc = h;
 	DPRINTFN(0, ("%s: sc=%p, speed=%d ebofs=%d maxsize=%d\n",
 		     __func__, sc, p->speed, p->ebofs, p->maxsize));
 	if (sc->sc_dying)
 		return EIO;
 @@ -769,48 +769,48 @@ filt_udsirrdetach(struct knote *kn)
 	s = splusb();
 	SLIST_REMOVE(&sc->sc_rd_sel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
+}
 /* ARGSUSED */
 static int
 filt_udsirread(struct knote *kn, long hint)
+{
 	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
 filt_udsirwdetach(struct knote *kn)
+{
 	struct udsir_softc *sc = kn->kn_hook;
 	int s;
 	s = splusb();
 	SLIST_REMOVE(&sc->sc_wr_sel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
+}
 /* ARGSUSED */
 static int
 filt_udsirwrite(struct knote *kn, long hint)
+{
 	struct udsir_softc *sc = kn->kn_hook;
 	kn->kn_data = 0;
-	return (sc->sc_direction != udir_input);
+	return sc->sc_direction != udir_input;
+}
 static void
 udsir_thread(void *arg)
+{
 	struct udsir_softc *sc = arg;
 	int error;
 	DPRINTFN(20, ("%s: starting polling thread\n", __func__));
 	while (!sc->sc_closing) {
 		if (!sc->sc_rd_readinprogress && !UDSIR_BLOCK_RX_DATA(sc))

 @@ -1,14 +1,14 @@
-/*	$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
  * Copyright (c) 2008 Fredrik Lindberg
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -27,27 +27,27 @@
  */
 /*
  *   This driver originated as the hso module for FreeBSD written by
  * Fredrik Lindberg[1]. It has been rewritten almost completely for
  * NetBSD, and to support more devices with information extracted from
  * the Linux hso driver provided by Option N.V.[2]
+ *
  *   [1] http://www.shapeshifter.se/code/hso
  *   [2] http://www.pharscape.org/hso.htm
  */
 #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"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 @@ -615,27 +615,27 @@ uhso_switch_mode(struct usbd_device *ude
 	cmd.bCDBLength = 6;
 	memset(&cmd.CBWCDB, 0, CBWCDBLENGTH);
 	cmd.CBWCDB[0] = SCSI_REZERO_UNIT;
 	usbd_setup_xfer(xfer, NULL, &cmd, sizeof(cmd),
 		USBD_SYNCHRONOUS, USBD_DEFAULT_TIMEOUT, NULL);
 	status = usbd_transfer(xfer);
 	usbd_destroy_xfer(xfer);
 	usbd_close_pipe(pipe);
-	return (status == USBD_NORMAL_COMPLETION ? 0 : EIO);
+	return status == USBD_NORMAL_COMPLETION ? 0 : EIO;
+}
 Static int
 uhso_get_iface_spec(struct usb_attach_arg *uaa, uint8_t ifnum, uint8_t *spec)
+{
 	const struct uhso_dev *hd;
 	uint8_t config[17];
 	usb_device_request_t req;
 	usbd_status status;
 	hd = uhso_lookup(uaa->uaa_vendor, uaa->uaa_product);
 	KASSERT(hd != NULL);

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by ITOH Yasufumi.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -24,27 +24,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/select.h>
 @@ -107,29 +107,29 @@ int		ukyopon_activate(device_t, enum dev
 extern struct cfdriver ukyopon_cd;
 CFATTACH_DECL_NEW(ukyopon, sizeof(struct ukyopon_softc), ukyopon_match,
     ukyopon_attach, ukyopon_detach, ukyopon_activate);
 int
 ukyopon_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usbif_attach_arg *uiaa = aux;
 	if (uiaa->uiaa_vendor == USB_VENDOR_KYOCERA &&
 	    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
 ukyopon_attach(device_t parent, device_t self, void *aux)
+{
 	struct ukyopon_softc *sc = device_private(self);
 	struct usbif_attach_arg *uiaa = aux;
 	struct ucom_attach_args ucaa;
 	ucaa.ucaa_portno = (uiaa->uiaa_ifaceno == UKYOPON_MODEM_IFACE_INDEX) ?
 		UKYOPON_PORT_MODEM : UKYOPON_PORT_DATA;
 	ucaa.ucaa_methods = &ukyopon_methods;
 	ucaa.ucaa_info = (uiaa->uiaa_ifaceno == UKYOPON_MODEM_IFACE_INDEX) ?
 @@ -168,27 +168,27 @@ ukyopon_ioctl(void *addr, int portno, u_
 		strncpy(arg_id->ui_name, UKYOPON_NAME, sizeof(arg_id->ui_name));
 		arg_id->ui_busno =
 		    device_unit(sc->sc_umodem.sc_udev->ud_bus->ub_usbctl);
 		arg_id->ui_address = sc->sc_umodem.sc_udev->ud_addr;
 		arg_id->ui_model = UKYOPON_MODEL_UNKNOWN;
 		arg_id->ui_porttype = portno;
 		break;
 	default:
 		error = umodem_ioctl(addr, portno, cmd, data, flag, p);
 		break;
+	}
-	return (error);
+	return error;
+}
 int
 ukyopon_activate(device_t self, enum devact act)
+{
 	struct ukyopon_softc *sc = device_private(self);
 	return umodem_common_activate(&sc->sc_umodem, act);
+}
 int
 ukyopon_detach(device_t self, int flags)
+{

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 @@ -102,27 +102,27 @@ usbd_get_config_desc_full(struct usbd_de
+}
 usbd_status
 usbd_get_bos_desc(struct usbd_device *dev, int confidx,
 		     usb_bos_descriptor_t *d)
+{
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 	usbd_status err;
 	DPRINTFN(3, "confidx=%d", confidx, 0, 0, 0);
 	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);
 		return USBD_INVAL;
+	}
 	return USBD_NORMAL_COMPLETION;
+}
 usbd_status
 usbd_get_bos_desc_full(struct usbd_device *dev, int conf, void *d, int size)
+{
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 @@ -202,27 +202,27 @@ usbd_get_port_status(struct usbd_device
 usbd_status
 usbd_get_port_status_ext(struct usbd_device *dev, int port,
     usb_port_status_ext_t *pse)
+{
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 	usb_device_request_t req;
 	DPRINTF("dev %p port %d", dev, port, 0, 0);
 	req.bmRequestType = UT_READ_CLASS_OTHER;
 	req.bRequest = UR_GET_STATUS;
 	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
 usbd_clear_hub_feature(struct usbd_device *dev, int sel)
+{
 	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 	usb_device_request_t req;
 	DPRINTF("dev %p sel %d", dev, sel, 0, 0);
 	req.bmRequestType = UT_WRITE_CLASS_DEVICE;
 	req.bRequest = UR_CLEAR_FEATURE;
 	USETW(req.wValue, sel);
 	USETW(req.wIndex, 0);

 @@ -1,14 +1,14 @@
-/* $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 */
 /*
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roland C. Dowdeswell <elric@netbsd.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -48,27 +48,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #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"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 @@ -273,27 +273,27 @@ uslsa_detach(device_t self, int flags)
 	struct uslsa_softc *sc = device_private(self);
 	int rv = 0;
 	DPRINTF((self, "%s(%p, %#x)\n", __func__, self, flags));
 	sc->sc_dying = true;
 	if (sc->sc_subdev != NULL) {
 		rv = config_detach(sc->sc_subdev, flags);
+	}
 	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
-	return (rv);
+	return rv;
+}
 static int
 uslsa_usbd_errno(usbd_status status)
+{
 	switch (status) {
 	case USBD_NORMAL_COMPLETION:
 		return 0;
 	case USBD_STALLED:
 		return EINVAL;
 	default:
 		return EIO;
+	}

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by  Lennart Augustsson <lennart@augustsson.net>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/ezload.h>
 @@ -59,29 +59,29 @@ int	uyap_detach(device_t, int);
 int	uyap_activate(device_t, enum devact);
 extern struct cfdriver uyap_cd;
 CFATTACH_DECL_NEW(uyap, sizeof(struct uyap_softc), uyap_match, uyap_attach,
     uyap_detach, uyap_activate);
 int
 uyap_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usb_attach_arg *uaa = aux;
 	/* 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
 uyap_attach(device_t parent, device_t self, void *aux)
+{
 	struct uyap_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	usbd_status err;
 	char *devinfop;
 	sc->sc_dev = self;
 @@ -103,21 +103,21 @@ uyap_attach(device_t parent, device_t se
 	aprint_verbose_dev(self,
 	    "firmware download complete, disconnecting.\n");
 	return;
+}
 int
 uyap_detach(device_t self, int flags)
+{
 #if 0
 	struct uyap_softc *sc = device_private(self);
 #endif
-	return (0);
+	return 0;
+}
 int
 uyap_activate(device_t self, enum devact act)
+{
 	return 0;
+}