Module Name: src
Committed By: skrll
Date: Tue Jan 22 06:47:20 UTC 2019
Modified Files:
src/sys/dev/usb: auvitek_video.c if_run.c slurm.c uark.c uatp.c
uberry.c ubsa.c uhso.c ukyopon.c uslsa.c uyap.c uyurex.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/auvitek_video.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/slurm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/uatp.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/ukyopon.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/uyap.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/uyurex.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.8 src/sys/dev/usb/auvitek_video.c:1.9
--- src/sys/dev/usb/auvitek_video.c:1.8 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/usb/auvitek_video.c Tue Jan 22 06:47:20 2019
@@ -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 <jmcne...@invisible.ca>
@@ -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_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.31 src/sys/dev/usb/if_run.c:1.32
--- src/sys/dev/usb/if_run.c:1.31 Thu Nov 29 18:53:42 2018
+++ src/sys/dev/usb/if_run.c Tue Jan 22 06:47:20 2019
@@ -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 @@ 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
@@ -4104,7 +4104,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
@@ -4169,7 +4169,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
@@ -4490,7 +4490,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.3 src/sys/dev/usb/slurm.c:1.4
--- src/sys/dev/usb/slurm.c:1.3 Thu Jul 7 06:55:42 2016
+++ src/sys/dev/usb/slurm.c Tue Jan 22 06:47:20 2019
@@ -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 @@ 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.11 src/sys/dev/usb/uark.c:1.12
--- src/sys/dev/usb/uark.c:1.11 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uark.c Tue Jan 22 06:47:20 2019
@@ -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 @@ 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.18 src/sys/dev/usb/uatp.c:1.19
--- src/sys/dev/usb/uatp.c:1.18 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/usb/uatp.c Tue Jan 22 06:47:20 2019
@@ -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 @@ 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
@@ -2614,7 +2614,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.12 src/sys/dev/usb/uberry.c:1.13
--- src/sys/dev/usb/uberry.c:1.12 Sun Dec 4 10:12:35 2016
+++ src/sys/dev/usb/uberry.c Tue Jan 22 06:47:20 2019
@@ -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 @@ 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.34 src/sys/dev/usb/ubsa.c:1.35
--- src/sys/dev/usb/ubsa.c:1.34 Sun Dec 4 10:12:35 2016
+++ src/sys/dev/usb/ubsa.c Tue Jan 22 06:47:20 2019
@@ -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 @@ 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/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.28 src/sys/dev/usb/uhso.c:1.29
--- src/sys/dev/usb/uhso.c:1.28 Tue Jun 26 06:48:02 2018
+++ src/sys/dev/usb/uhso.c Tue Jan 22 06:47:20 2019
@@ -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 @@ 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.19 src/sys/dev/usb/ukyopon.c:1.20
--- src/sys/dev/usb/ukyopon.c:1.19 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/ukyopon.c Tue Jan 22 06:47:20 2019
@@ -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 @@ 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/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.25 src/sys/dev/usb/uslsa.c:1.26
--- src/sys/dev/usb/uslsa.c:1.25 Fri Dec 22 14:41:55 2017
+++ src/sys/dev/usb/uslsa.c Tue Jan 22 06:47:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.25 2017/12/22 14:41:55 jakllsch Exp $ */
+/* $NetBSD: uslsa.c,v 1.26 2019/01/22 06:47:20 skrll Exp $ */
/* from ugensa.c */
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.25 2017/12/22 14:41:55 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.26 2019/01/22 06:47:20 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -287,7 +287,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.21 src/sys/dev/usb/uyap.c:1.22
--- src/sys/dev/usb/uyap.c:1.21 Thu Jul 14 04:19:27 2016
+++ src/sys/dev/usb/uyap.c Tue Jan 22 06:47:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uyap.c,v 1.21 2016/07/14 04:19:27 msaitoh Exp $ */
+/* $NetBSD: uyap.c,v 1.22 2019/01/22 06:47:20 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.21 2016/07/14 04:19:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.22 2019/01/22 06:47:20 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
Index: src/sys/dev/usb/uyurex.c
diff -u src/sys/dev/usb/uyurex.c:1.13 src/sys/dev/usb/uyurex.c:1.14
--- src/sys/dev/usb/uyurex.c:1.13 Sun Dec 10 17:03:07 2017
+++ src/sys/dev/usb/uyurex.c Tue Jan 22 06:47:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uyurex.c,v 1.13 2017/12/10 17:03:07 bouyer Exp $ */
+/* $NetBSD: uyurex.c,v 1.14 2019/01/22 06:47:20 skrll Exp $ */
/* $OpenBSD: uyurex.c,v 1.3 2010/03/04 03:47:22 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.13 2017/12/10 17:03:07 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.14 2019/01/22 06:47:20 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -125,7 +125,7 @@ uyurex_match(device_t parent, cfdata_t m
if (uyurex_lookup(uha->uiaa->uiaa_vendor, uha->uiaa->uiaa_product) == NULL)
return UMATCH_NONE;
- return (UMATCH_VENDOR_PRODUCT);
+ return UMATCH_VENDOR_PRODUCT;
}
void
@@ -224,7 +224,7 @@ uyurex_detach(device_t self, int flags)
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
sc->sc_hdev.sc_dev);
- return (rv);
+ return rv;
}
int
@@ -237,7 +237,7 @@ uyurex_activate(device_t self, enum deva
sc->sc_dying = 1;
break;
}
- return (0);
+ return 0;
}
void
