Module Name: src
Committed By: skrll
Date: Tue Dec 23 11:24:32 UTC 2014
Modified Files:
src/sys/dev/usb [nick-nhusb]: ezload.c if_cdce.c if_kue.c if_run.c
if_smsc.c if_urndis.c if_urtw.c if_urtwn.c moscom.c u3g.c ucom.c
umass_scsipi.c umcs.c umodem.c uthum.c uvideo.c uvscom.c
Log Message:
KNF. No brackets around return value.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.14.1 src/sys/dev/usb/ezload.c
cvs rdiff -u -r1.38.14.1 -r1.38.14.2 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.81.4.2 -r1.81.4.3 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.10.6.1 -r1.10.6.2 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.22.2.2 -r1.22.2.3 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.9.4.1 -r1.9.4.2 src/sys/dev/usb/if_urndis.c
cvs rdiff -u -r1.6.6.4 -r1.6.6.5 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.34.4.4 -r1.34.4.5 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.8.14.2 -r1.8.14.3 src/sys/dev/usb/moscom.c
cvs rdiff -u -r1.31.2.6 -r1.31.2.7 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.108.2.3 -r1.108.2.4 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.49.2.1 -r1.49.2.2 src/sys/dev/usb/umass_scsipi.c
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/sys/dev/usb/umcs.c
cvs rdiff -u -r1.66.4.2 -r1.66.4.3 src/sys/dev/usb/umodem.c
cvs rdiff -u -r1.10.14.1 -r1.10.14.2 src/sys/dev/usb/uthum.c
cvs rdiff -u -r1.41.2.5 -r1.41.2.6 src/sys/dev/usb/uvideo.c
cvs rdiff -u -r1.28.16.3 -r1.28.16.4 src/sys/dev/usb/uvscom.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/ezload.c
diff -u src/sys/dev/usb/ezload.c:1.15 src/sys/dev/usb/ezload.c:1.15.14.1
--- src/sys/dev/usb/ezload.c:1.15 Sat Jan 5 23:34:16 2013
+++ src/sys/dev/usb/ezload.c Tue Dec 23 11:24:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ezload.c,v 1.15 2013/01/05 23:34:16 christos Exp $ */
+/* $NetBSD: ezload.c,v 1.15.14.1 2014/12/23 11:24:31 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.15 2013/01/05 23:34:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.15.14.1 2014/12/23 11:24:31 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@ ezload_reset(usbd_device_handle dev, int
USETW(req.wValue, ANCHOR_CPUCS_REG);
USETW(req.wIndex, 0);
USETW(req.wLength, 1);
- return (usbd_do_request(dev, &req, &rst));
+ return usbd_do_request(dev, &req, &rst);
}
usbd_status
@@ -115,7 +115,7 @@ ezload_download(usbd_device_handle dev,
#if 0
if (ptr->address + ptr->length > ANCHOR_MAX_INTERNAL_ADDRESS)
- return (USBD_INVAL);
+ return USBD_INVAL;
#endif
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
@@ -133,11 +133,11 @@ ezload_download(usbd_device_handle dev,
err = usbd_do_request(dev, &req,
__UNCONST(ptr->data + offs));
if (err)
- return (err);
+ return err;
}
}
- return (0);
+ return 0;
}
usbd_status
@@ -148,15 +148,15 @@ ezload_downloads_and_reset(usbd_device_h
/*(void)ezload_reset(dev, 1);*/
err = ezload_reset(dev, 1);
if (err)
- return (err);
+ return err;
usbd_delay_ms(dev, 250);
while (*recs != NULL) {
err = ezload_download(dev, *recs++);
if (err)
- return (err);
+ return err;
}
usbd_delay_ms(dev, 250);
err = ezload_reset(dev, 0);
usbd_delay_ms(dev, 250);
- return (err);
+ return err;
}
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.38.14.1 src/sys/dev/usb/if_cdce.c:1.38.14.2
--- src/sys/dev/usb/if_cdce.c:1.38.14.1 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_cdce.c Tue Dec 23 11:24:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.38.14.1 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_cdce.c,v 1.38.14.2 2014/12/23 11:24:31 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <[email protected]>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.38.14.1 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.38.14.2 2014/12/23 11:24:31 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -123,13 +123,13 @@ cdce_match(device_t parent, cfdata_t mat
struct usbif_attach_arg *uaa = aux;
if (cdce_lookup(uaa->vendor, uaa->product) != NULL)
- return (UMATCH_VENDOR_PRODUCT);
+ return UMATCH_VENDOR_PRODUCT;
if (uaa->class == UICLASS_CDC && uaa->subclass ==
UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL)
- return (UMATCH_IFACECLASS_GENERIC);
+ return UMATCH_IFACECLASS_GENERIC;
- return (UMATCH_NONE);
+ return UMATCH_NONE;
}
void
@@ -315,7 +315,7 @@ cdce_detach(device_t self, int flags)
if (!sc->cdce_attached) {
splx(s);
- return (0);
+ return 0;
}
if (ifp->if_flags & IFF_RUNNING)
@@ -328,7 +328,7 @@ cdce_detach(device_t self, int flags)
sc->cdce_attached = 0;
splx(s);
- return (0);
+ return 0;
}
Static void
@@ -384,12 +384,12 @@ cdce_encap(struct cdce_softc *sc, struct
err = usbd_transfer(c->cdce_xfer);
if (err != USBD_IN_PROGRESS) {
cdce_stop(sc);
- return (EIO);
+ return EIO;
}
sc->cdce_cdata.cdce_tx_cnt++;
- return (0);
+ return 0;
}
Static void
@@ -461,7 +461,7 @@ cdce_ioctl(struct ifnet *ifp, u_long com
int s, error = 0;
if (sc->cdce_dying)
- return (EIO);
+ return EIO;
s = splnet();
@@ -511,7 +511,7 @@ cdce_ioctl(struct ifnet *ifp, u_long com
if (error == ENETRESET)
error = 0;
- return (error);
+ return error;
}
Static void
@@ -596,14 +596,14 @@ cdce_newbuf(struct cdce_softc *sc, struc
if (m_new == NULL) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", device_xname(sc->cdce_dev));
- return (ENOBUFS);
+ return ENOBUFS;
}
MCLGET(m_new, M_DONTWAIT);
if (!(m_new->m_flags & M_EXT)) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", device_xname(sc->cdce_dev));
m_freem(m_new);
- return (ENOBUFS);
+ return ENOBUFS;
}
m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
} else {
@@ -612,7 +612,7 @@ cdce_newbuf(struct cdce_softc *sc, struc
m_new->m_data = m_new->m_ext.ext_buf;
}
c->cdce_mbuf = m_new;
- return (0);
+ return 0;
}
Static int
@@ -628,19 +628,19 @@ cdce_rx_list_init(struct cdce_softc *sc)
c->cdce_sc = sc;
c->cdce_idx = i;
if (cdce_newbuf(sc, c, NULL) == ENOBUFS)
- return (ENOBUFS);
+ return ENOBUFS;
if (c->cdce_xfer == NULL) {
c->cdce_xfer = usbd_alloc_xfer(sc->cdce_udev);
if (c->cdce_xfer == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
c->cdce_buf = usbd_alloc_buffer(c->cdce_xfer,
CDCE_BUFSZ);
if (c->cdce_buf == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
}
}
- return (0);
+ return 0;
}
Static int
@@ -659,14 +659,14 @@ cdce_tx_list_init(struct cdce_softc *sc)
if (c->cdce_xfer == NULL) {
c->cdce_xfer = usbd_alloc_xfer(sc->cdce_udev);
if (c->cdce_xfer == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
c->cdce_buf = usbd_alloc_buffer(c->cdce_xfer, CDCE_BUFSZ);
if (c->cdce_buf == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
}
}
- return (0);
+ return 0;
}
Static void
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.81.4.2 src/sys/dev/usb/if_kue.c:1.81.4.3
--- src/sys/dev/usb/if_kue.c:1.81.4.2 Wed Dec 3 14:18:07 2014
+++ src/sys/dev/usb/if_kue.c Tue Dec 23 11:24:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.81.4.2 2014/12/03 14:18:07 skrll Exp $ */
+/* $NetBSD: if_kue.c,v 1.81.4.3 2014/12/23 11:24:31 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.81.4.2 2014/12/03 14:18:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.81.4.3 2014/12/23 11:24:31 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -197,7 +197,7 @@ kue_setword(struct kue_softc *sc, uint8_
USETW(req.wIndex, 0);
USETW(req.wLength, 0);
- return (usbd_do_request(sc->kue_udev, &req, NULL));
+ return usbd_do_request(sc->kue_udev, &req, NULL);
}
static usbd_status
@@ -219,7 +219,7 @@ kue_ctl(struct kue_softc *sc, int rw, ui
USETW(req.wIndex, 0);
USETW(req.wLength, len);
- return (usbd_do_request(sc->kue_udev, &req, data));
+ return usbd_do_request(sc->kue_udev, &req, data);
}
static int
@@ -245,11 +245,11 @@ kue_load_fw(struct kue_softc *sc)
* running.
*/
if (usbd_get_device_desc(sc->kue_udev, &dd))
- return (EIO);
+ return EIO;
if (UGETW(dd.bcdDevice) == KUE_WARM_REV) {
printf("%s: warm boot, no firmware download\n",
device_xname(sc->kue_dev));
- return (0);
+ return 0;
}
printf("%s: cold boot, downloading firmware\n",
@@ -264,7 +264,7 @@ kue_load_fw(struct kue_softc *sc)
if (err) {
printf("%s: failed to load code segment: %s\n",
device_xname(sc->kue_dev), usbd_errstr(err));
- return (EIO);
+ return EIO;
}
/* Load fixup segment */
@@ -276,7 +276,7 @@ kue_load_fw(struct kue_softc *sc)
if (err) {
printf("%s: failed to load fixup segment: %s\n",
device_xname(sc->kue_dev), usbd_errstr(err));
- return (EIO);
+ return EIO;
}
/* Send trigger command. */
@@ -288,7 +288,7 @@ kue_load_fw(struct kue_softc *sc)
if (err) {
printf("%s: failed to load trigger segment: %s\n",
device_xname(sc->kue_dev), usbd_errstr(err));
- return (EIO);
+ return EIO;
}
usbd_delay_ms(sc->kue_udev, 10);
@@ -308,7 +308,7 @@ kue_load_fw(struct kue_softc *sc)
/* Reset the adapter. */
kue_reset(sc);
- return (0);
+ return 0;
}
static void
@@ -383,8 +383,8 @@ kue_match(device_t parent, cfdata_t matc
DPRINTFN(25,("kue_match: enter\n"));
- return (kue_lookup(uaa->vendor, uaa->product) != NULL ?
- UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+ return kue_lookup(uaa->vendor, uaa->product) != NULL ?
+ UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
/*
@@ -536,7 +536,7 @@ kue_detach(device_t self, int flags)
if (!sc->kue_attached) {
/* Detached before attached finished, so just bail out. */
splx(s);
- return (0);
+ return 0;
}
if (ifp->if_flags & IFF_RUNNING)
@@ -557,7 +557,7 @@ kue_detach(device_t self, int flags)
sc->kue_attached = false;
splx(s);
- return (0);
+ return 0;
}
int
@@ -595,14 +595,14 @@ kue_rx_list_init(struct kue_softc *sc)
if (c->kue_xfer == NULL) {
c->kue_xfer = usbd_alloc_xfer(sc->kue_udev);
if (c->kue_xfer == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
c->kue_buf = usbd_alloc_buffer(c->kue_xfer, KUE_BUFSZ);
if (c->kue_buf == NULL)
- return (ENOBUFS); /* XXX free xfer */
+ return ENOBUFS; /* XXX free xfer */
}
}
- return (0);
+ return 0;
}
static int
@@ -622,14 +622,14 @@ kue_tx_list_init(struct kue_softc *sc)
if (c->kue_xfer == NULL) {
c->kue_xfer = usbd_alloc_xfer(sc->kue_udev);
if (c->kue_xfer == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
c->kue_buf = usbd_alloc_buffer(c->kue_xfer, KUE_BUFSZ);
if (c->kue_buf == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
}
}
- return (0);
+ return 0;
}
/*
@@ -820,12 +820,12 @@ kue_send(struct kue_softc *sc, struct mb
printf("%s: kue_send error=%s\n", device_xname(sc->kue_dev),
usbd_errstr(err));
kue_stop(sc);
- return (EIO);
+ return EIO;
}
sc->kue_cdata.kue_tx_cnt++;
- return (0);
+ return 0;
}
static void
@@ -950,7 +950,7 @@ kue_open_pipes(struct kue_softc *sc)
if (err) {
printf("%s: open rx pipe failed: %s\n",
device_xname(sc->kue_dev), usbd_errstr(err));
- return (EIO);
+ return EIO;
}
err = usbd_open_pipe(sc->kue_iface, sc->kue_ed[KUE_ENDPT_TX],
@@ -958,7 +958,7 @@ kue_open_pipes(struct kue_softc *sc)
if (err) {
printf("%s: open tx pipe failed: %s\n",
device_xname(sc->kue_dev), usbd_errstr(err));
- return (EIO);
+ return EIO;
}
/* Start up the receive pipe. */
@@ -973,7 +973,7 @@ kue_open_pipes(struct kue_softc *sc)
usbd_transfer(c->kue_xfer);
}
- return (0);
+ return 0;
}
static int
@@ -987,7 +987,7 @@ kue_ioctl(struct ifnet *ifp, u_long comm
DPRINTFN(5,("%s: %s: enter\n", device_xname(sc->kue_dev),__func__));
if (sc->kue_dying)
- return (EIO);
+ return EIO;
s = splnet();
@@ -1053,7 +1053,7 @@ kue_ioctl(struct ifnet *ifp, u_long comm
splx(s);
- return (error);
+ return error;
}
static void
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.10.6.1 src/sys/dev/usb/if_run.c:1.10.6.2
--- src/sys/dev/usb/if_run.c:1.10.6.1 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_run.c Tue Dec 23 11:24:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_run.c,v 1.10.6.1 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_run.c,v 1.10.6.2 2014/12/23 11:24:31 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.1 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.10.6.2 2014/12/23 11:24:31 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -451,17 +451,17 @@ firmware_load(const char *dname, const c
int error;
if ((error = firmware_open(dname, iname, &fh)) != 0)
- return (error);
+ return error;
*sizep = firmware_get_size(fh);
if ((*ucodep = firmware_malloc(*sizep)) == NULL) {
firmware_close(fh);
- return (ENOMEM);
+ return ENOMEM;
}
if ((error = firmware_read(fh, 0, *ucodep, *sizep)) != 0)
firmware_free(*ucodep, *sizep);
firmware_close(fh);
- return (error);
+ return error;
}
static int
@@ -673,7 +673,7 @@ run_detach(device_t self, int flags)
int s;
if (ifp->if_softc == NULL)
- return (0);
+ return 0;
s = splnet();
@@ -696,7 +696,7 @@ run_detach(device_t self, int flags)
callout_destroy(&sc->scan_to);
callout_destroy(&sc->calib_to);
- return (0);
+ return 0;
}
static int
@@ -707,9 +707,9 @@ run_activate(device_t self, enum devact
switch (act) {
case DVACT_DEACTIVATE:
if_deactivate(sc->sc_ic.ic_ifp);
- return (0);
+ return 0;
default:
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
}
}
@@ -741,7 +741,7 @@ run_alloc_rx_ring(struct run_softc *sc)
}
if (error != 0)
fail: run_free_rx_ring(sc);
- return (error);
+ return error;
}
static void
@@ -796,7 +796,7 @@ run_alloc_tx_ring(struct run_softc *sc,
}
if (error != 0)
fail: run_free_tx_ring(sc, qid);
- return (error);
+ return error;
}
static void
@@ -838,13 +838,13 @@ run_load_microcode(struct run_softc *sc)
if ((error = firmware_load("run", fwname, &ucode, &size)) != 0) {
aprint_error_dev(sc->sc_dev,
"error %d, could not read firmware %s\n", error, fwname);
- return (error);
+ return error;
}
if (size != 4096) {
aprint_error_dev(sc->sc_dev,
"invalid firmware size (should be 4KB)\n");
firmware_free(ucode, size);
- return (EINVAL);
+ return EINVAL;
}
run_read(sc, RT2860_ASIC_VER_ID, &tmp);
@@ -860,17 +860,17 @@ run_load_microcode(struct run_softc *sc)
USETW(req.wIndex, 0);
USETW(req.wLength, 0);
if ((error = usbd_do_request(sc->sc_udev, &req, NULL)) != 0)
- return (error);
+ return error;
usbd_delay_ms(sc->sc_udev, 10);
run_write(sc, RT2860_H2M_MAILBOX, 0);
if ((error = run_mcu_cmd(sc, RT2860_MCU_CMD_RFRESET, 0)) != 0)
- return (error);
+ return error;
/* wait until microcontroller is ready */
for (ntries = 0; ntries < 1000; ntries++) {
if ((error = run_read(sc, RT2860_SYS_CTRL, &tmp)) != 0)
- return (error);
+ return error;
if (tmp & RT2860_MCU_READY)
break;
DELAY(1000);
@@ -878,13 +878,13 @@ run_load_microcode(struct run_softc *sc)
if (ntries == 1000) {
aprint_error_dev(sc->sc_dev,
"timeout waiting for MCU to initialize\n");
- return (ETIMEDOUT);
+ return ETIMEDOUT;
}
sc->sc_flags |= RUN_FWLOADED;
DPRINTF(("microcode successfully loaded after %d tries\n", ntries));
- return (0);
+ return 0;
}
static int
@@ -911,7 +911,7 @@ run_read(struct run_softc *sc, uint16_t
*val = le32toh(tmp);
else
*val = 0xffffffff;
- return (error);
+ return error;
}
static int
@@ -947,7 +947,7 @@ run_write(struct run_softc *sc, uint16_t
if ((error = run_write_2(sc, reg, val & 0xffff)) == 0)
error = run_write_2(sc, reg + 2, val >> 16);
- return (error);
+ return error;
}
static int
@@ -963,7 +963,7 @@ run_write_region_1(struct run_softc *sc,
KASSERT((len & 1) == 0);
for (i = 0; i < len && error == 0; i += 2)
error = run_write_2(sc, reg + i, buf[i] | buf[i + 1] << 8);
- return (error);
+ return error;
#else
usb_device_request_t req;
@@ -983,7 +983,7 @@ run_set_region_4(struct run_softc *sc, u
for (; count > 0 && error == 0; count--, reg += 4)
error = run_write(sc, reg, val);
- return (error);
+ return error;
}
/* Read 16-bit from eFUSE ROM (RT3070 only.) */
@@ -995,7 +995,7 @@ run_efuse_read_2(struct run_softc *sc, u
int error, ntries;
if ((error = run_read(sc, RT3070_EFUSE_CTRL, &tmp)) != 0)
- return (error);
+ return error;
addr *= 2;
/*-
@@ -1010,25 +1010,25 @@ run_efuse_read_2(struct run_softc *sc, u
run_write(sc, RT3070_EFUSE_CTRL, tmp);
for (ntries = 0; ntries < 100; ntries++) {
if ((error = run_read(sc, RT3070_EFUSE_CTRL, &tmp)) != 0)
- return (error);
+ return error;
if (!(tmp & RT3070_EFSROM_KICK))
break;
DELAY(2);
}
if (ntries == 100)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
if ((tmp & RT3070_EFUSE_AOUT_MASK) == RT3070_EFUSE_AOUT_MASK) {
*val = 0xffff; /* address not found */
- return (0);
+ return 0;
}
/* 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);
+ return error;
*val = (addr & 2) ? tmp >> 16 : tmp & 0xffff;
- return (0);
+ return 0;
}
static int
@@ -1049,7 +1049,7 @@ run_eeprom_read_2(struct run_softc *sc,
*val = le16toh(tmp);
else
*val = 0xffff;
- return (error);
+ return error;
}
static __inline int
@@ -1068,12 +1068,12 @@ run_rt2870_rf_write(struct run_softc *sc
for (ntries = 0; ntries < 10; ntries++) {
if ((error = run_read(sc, RT2860_RF_CSR_CFG0, &tmp)) != 0)
- return (error);
+ return error;
if (!(tmp & RT2860_RF_REG_CTRL))
break;
}
if (ntries == 10)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
/* RF registers are 24-bit on the RT2860 */
tmp = RT2860_RF_REG_CTRL | 24 << RT2860_RF_REG_WIDTH_SHIFT |
@@ -1089,28 +1089,28 @@ run_rt3070_rf_read(struct run_softc *sc,
for (ntries = 0; ntries < 100; ntries++) {
if ((error = run_read(sc, RT3070_RF_CSR_CFG, &tmp)) != 0)
- return (error);
+ return error;
if (!(tmp & RT3070_RF_KICK))
break;
}
if (ntries == 100)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
tmp = RT3070_RF_KICK | reg << 8;
if ((error = run_write(sc, RT3070_RF_CSR_CFG, tmp)) != 0)
- return (error);
+ return error;
for (ntries = 0; ntries < 100; ntries++) {
if ((error = run_read(sc, RT3070_RF_CSR_CFG, &tmp)) != 0)
- return (error);
+ return error;
if (!(tmp & RT3070_RF_KICK))
break;
}
if (ntries == 100)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
*val = tmp & 0xff;
- return (0);
+ return 0;
}
static int
@@ -1121,12 +1121,12 @@ run_rt3070_rf_write(struct run_softc *sc
for (ntries = 0; ntries < 10; ntries++) {
if ((error = run_read(sc, RT3070_RF_CSR_CFG, &tmp)) != 0)
- return (error);
+ return error;
if (!(tmp & RT3070_RF_KICK))
break;
}
if (ntries == 10)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
tmp = RT3070_RF_WRITE | RT3070_RF_KICK | reg << 8 | val;
return run_write(sc, RT3070_RF_CSR_CFG, tmp);
@@ -1140,28 +1140,28 @@ run_bbp_read(struct run_softc *sc, uint8
for (ntries = 0; ntries < 10; ntries++) {
if ((error = run_read(sc, RT2860_BBP_CSR_CFG, &tmp)) != 0)
- return (error);
+ return error;
if (!(tmp & RT2860_BBP_CSR_KICK))
break;
}
if (ntries == 10)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
tmp = RT2860_BBP_CSR_READ | RT2860_BBP_CSR_KICK | reg << 8;
if ((error = run_write(sc, RT2860_BBP_CSR_CFG, tmp)) != 0)
- return (error);
+ return error;
for (ntries = 0; ntries < 10; ntries++) {
if ((error = run_read(sc, RT2860_BBP_CSR_CFG, &tmp)) != 0)
- return (error);
+ return error;
if (!(tmp & RT2860_BBP_CSR_KICK))
break;
}
if (ntries == 10)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
*val = tmp & 0xff;
- return (0);
+ return 0;
}
static int
@@ -1172,12 +1172,12 @@ run_bbp_write(struct run_softc *sc, uint
for (ntries = 0; ntries < 10; ntries++) {
if ((error = run_read(sc, RT2860_BBP_CSR_CFG, &tmp)) != 0)
- return (error);
+ return error;
if (!(tmp & RT2860_BBP_CSR_KICK))
break;
}
if (ntries == 10)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
tmp = RT2860_BBP_CSR_KICK | reg << 8 | val;
return run_write(sc, RT2860_BBP_CSR_CFG, tmp);
@@ -1194,17 +1194,17 @@ run_mcu_cmd(struct run_softc *sc, uint8_
for (ntries = 0; ntries < 100; ntries++) {
if ((error = run_read(sc, RT2860_H2M_MAILBOX, &tmp)) != 0)
- return (error);
+ return error;
if (!(tmp & RT2860_H2M_BUSY))
break;
}
if (ntries == 100)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
tmp = RT2860_H2M_BUSY | RT2860_TOKEN_NO_INTR << 16 | arg;
if ((error = run_write(sc, RT2860_H2M_MAILBOX, tmp)) == 0)
error = run_write(sc, RT2860_HOST_CMD, cmd);
- return (error);
+ return error;
}
/*
@@ -1225,7 +1225,7 @@ b4inc(uint32_t b32, int8_t delta)
b4 = 0xf;
b32 = b32 >> 4 | b4 << 28;
}
- return (b32);
+ return b32;
}
static const char *
@@ -1495,7 +1495,7 @@ run_read_eeprom(struct run_softc *sc)
sc->rssi_5ghz[ant] = 0;
}
}
- return (0);
+ return 0;
}
static struct ieee80211_node *
@@ -1503,7 +1503,7 @@ run_node_alloc(struct ieee80211_node_tab
{
struct run_node *rn =
malloc(sizeof (struct run_node), M_DEVBUF, M_NOWAIT | M_ZERO);
- return (rn) ? &rn->ni : NULL;
+ return rn ? &rn->ni : NULL;
}
static int
@@ -1516,7 +1516,7 @@ run_media_change(struct ifnet *ifp)
error = ieee80211_media_change(ifp);
if (error != ENETRESET)
- return (error);
+ return error;
if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE) {
rate = ic->ic_sup_rates[ic->ic_curmode].
@@ -1530,7 +1530,7 @@ run_media_change(struct ifnet *ifp)
if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) == (IFF_UP | IFF_RUNNING))
run_init(ifp);
- return (0);
+ return 0;
}
static void
@@ -1602,7 +1602,7 @@ run_newstate(struct ieee80211com *ic, en
cmd.state = nstate;
cmd.arg = arg;
run_do_async(sc, run_newstate_cb, &cmd, sizeof cmd);
- return (0);
+ return 0;
}
static void
@@ -1698,7 +1698,7 @@ run_updateedca(struct ieee80211com *ic)
/* do it in a process context */
run_do_async(ic->ic_ifp->if_softc, run_updateedca_cb, NULL, 0);
- return (0);
+ return 0;
}
/* ARGSUSED */
@@ -1997,7 +1997,7 @@ run_maxrssi_chain(struct run_softc *sc,
if (rxwi->rssi[2] > rxwi->rssi[rxchain])
rxchain = 2;
}
- return (rxchain);
+ return rxchain;
}
static void
@@ -2242,7 +2242,7 @@ run_tx(struct run_softc *sc, struct mbuf
k = ieee80211_crypto_encap(ic, ni, m);
if (k == NULL) {
m_freem(m);
- return (ENOBUFS);
+ return ENOBUFS;
}
/* packet header may have moved, reset our local pointer */
@@ -2349,7 +2349,7 @@ run_tx(struct run_softc *sc, struct mbuf
error = usbd_transfer(data->xfer);
if (__predict_false(error != USBD_IN_PROGRESS &&
error != USBD_NORMAL_COMPLETION))
- return (error);
+ return error;
ieee80211_free_node(ni);
@@ -2357,7 +2357,7 @@ run_tx(struct run_softc *sc, struct mbuf
if (++ring->queued >= RUN_TX_RING_COUNT)
sc->qfullmsk |= 1 << qid;
- return (0);
+ return 0;
}
static void
@@ -2497,7 +2497,7 @@ run_ioctl(struct ifnet *ifp, u_long cmd,
splx(s);
- return (error);
+ return error;
}
static void
@@ -2875,7 +2875,7 @@ run_set_chan(struct run_softc *sc, struc
chan = ieee80211_chan2ieee(ic, c);
if (chan == 0 || chan == IEEE80211_CHAN_ANY)
- return (EINVAL);
+ return EINVAL;
if (sc->mac_ver == 0x3572)
run_rt3572_set_chan(sc, chan);
@@ -2898,7 +2898,7 @@ run_set_chan(struct run_softc *sc, struc
run_select_chan_group(sc, group);
DELAY(1000);
- return (0);
+ return 0;
}
static void
@@ -3055,7 +3055,7 @@ run_rssi2dbm(struct run_softc *sc, uint8
} else
delta = sc->rssi_2ghz[rxchain] - sc->lna[0];
- return (-12 - delta - rssi);
+ return -12 - delta - rssi;
}
static int
@@ -3067,12 +3067,12 @@ run_bbp_init(struct run_softc *sc)
/* wait for BBP to wake up */
for (ntries = 0; ntries < 20; ntries++) {
if ((error = run_bbp_read(sc, 0, &bbp0)) != 0)
- return (error);
+ return error;
if (bbp0 != 0 && bbp0 != 0xff)
break;
}
if (ntries == 20)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
/* initialize BBP registers to default values */
for (i = 0; i < (int)__arraycount(rt2860_def_bbp); i++) {
@@ -3092,7 +3092,7 @@ run_bbp_init(struct run_softc *sc)
run_bbp_write(sc, 69, 0x16);
run_bbp_write(sc, 73, 0x12);
}
- return (0);
+ return 0;
}
static int
@@ -3225,7 +3225,7 @@ run_rt3070_rf_init(struct run_softc *sc)
rf |= 0x03;
run_rt3070_rf_write(sc, 27, rf);
}
- return (0);
+ return 0;
}
static int
@@ -3257,7 +3257,7 @@ run_rt3070_filter_calib(struct run_softc
break;
}
if (ntries == 100)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
/* set power and frequency of stopband test tone */
run_bbp_write(sc, 24, 0x06);
@@ -3290,7 +3290,7 @@ run_rt3070_filter_calib(struct run_softc
run_rt3070_rf_read(sc, 22, &rf22);
run_rt3070_rf_write(sc, 22, rf22 & ~0x01);
- return (0);
+ return 0;
}
static void
@@ -3380,13 +3380,13 @@ run_txrx_enable(struct run_softc *sc)
run_write(sc, RT2860_MAC_SYS_CTRL, RT2860_MAC_TX_EN);
for (ntries = 0; ntries < 200; ntries++) {
if ((error = run_read(sc, RT2860_WPDMA_GLO_CFG, &tmp)) != 0)
- return (error);
+ return error;
if ((tmp & (RT2860_TX_DMA_BUSY | RT2860_RX_DMA_BUSY)) == 0)
break;
DELAY(1000);
}
if (ntries == 200)
- return (ETIMEDOUT);
+ return ETIMEDOUT;
DELAY(50);
@@ -3413,7 +3413,7 @@ run_txrx_enable(struct run_softc *sc)
run_write(sc, RT2860_MAC_SYS_CTRL,
RT2860_MAC_RX_EN | RT2860_MAC_TX_EN);
- return (0);
+ return 0;
}
static int
@@ -3641,7 +3641,7 @@ run_init(struct ifnet *ifp)
if (error != 0)
fail: run_stop(ifp, 1);
- return (error);
+ return error;
}
static void
@@ -3703,7 +3703,7 @@ run_setup_beacon(struct run_softc *sc)
int ridx;
if ((m = ieee80211_beacon_alloc(ic, ic->ic_bss, &sc->sc_bo)) == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
memset(&txwi, 0, sizeof txwi);
txwi.wcid = 0xff;
@@ -3724,7 +3724,7 @@ run_setup_beacon(struct run_softc *sc)
m_freem(m);
- return (0);
+ return 0;
}
#endif
@@ -3745,14 +3745,14 @@ if_run_modcmd(modcmd_t cmd, void *arg)
error = config_init_component(cfdriver_ioconf_run,
cfattach_ioconf_run, cfdata_ioconf_run);
#endif
- return (error);
+ return error;
case MODULE_CMD_FINI:
#ifdef _MODULE
error = config_fini_component(cfdriver_ioconf_run,
cfattach_ioconf_run, cfdata_ioconf_run);
#endif
- return (error);
+ return error;
default:
- return (ENOTTY);
+ return ENOTTY;
}
}
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.22.2.2 src/sys/dev/usb/if_smsc.c:1.22.2.3
--- src/sys/dev/usb/if_smsc.c:1.22.2.2 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/if_smsc.c Tue Dec 23 11:24:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.22.2.2 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: if_smsc.c,v 1.22.2.3 2014/12/23 11:24:31 skrll Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -211,7 +211,7 @@ smsc_read_reg(struct smsc_softc *sc, uin
*data = le32toh(buf);
- return (err);
+ return err;
}
int
@@ -233,7 +233,7 @@ smsc_write_reg(struct smsc_softc *sc, ui
if (err != 0)
smsc_warn_printf(sc, "Failed to write register 0x%0x\n", off);
- return (err);
+ return err;
}
int
@@ -244,13 +244,13 @@ smsc_wait_for_bits(struct smsc_softc *sc
for (i = 0; i < 100; i++) {
if ((err = smsc_read_reg(sc, reg, &val)) != 0)
- return (err);
+ return err;
if (!(val & bits))
- return (0);
+ return 0;
DELAY(5);
}
- return (1);
+ return 1;
}
int
@@ -277,7 +277,7 @@ smsc_miibus_readreg(device_t dev, int ph
done:
smsc_unlock_mii(sc);
- return (val & 0xFFFF);
+ return val & 0xFFFF;
}
void
@@ -395,7 +395,7 @@ smsc_ifmedia_upd(struct ifnet *ifp)
mii_phy_reset(miisc);
}
err = mii_mediachg(mii);
- return (err);
+ return err;
}
void
@@ -479,7 +479,7 @@ smsc_sethwcsum(struct smsc_softc *sc)
if (err != 0) {
smsc_warn_printf(sc, "failed to read SMSC_COE_CTRL (err=%d)\n",
err);
- return (err);
+ return err;
}
/* Enable/disable the Rx checksum */
@@ -500,10 +500,10 @@ smsc_sethwcsum(struct smsc_softc *sc)
if (err != 0) {
smsc_warn_printf(sc, "failed to write SMSC_COE_CTRL (err=%d)\n",
err);
- return (err);
+ return err;
}
- return (0);
+ return 0;
}
int
@@ -524,7 +524,7 @@ smsc_setmacaddress(struct smsc_softc *sc
err = smsc_write_reg(sc, SMSC_MAC_ADDRH, val);
done:
- return (err);
+ return err;
}
void
@@ -892,11 +892,11 @@ smsc_chip_init(struct smsc_softc *sc)
sc->sc_mac_csr |= SMSC_MAC_CSR_RXEN;
smsc_write_reg(sc, SMSC_MAC_CSR, sc->sc_mac_csr);
- return (0);
+ return 0;
init_failed:
smsc_err_printf(sc, "smsc_chip_init failed (err=%d)\n", err);
- return (err);
+ return err;
}
int
@@ -1185,7 +1185,7 @@ smsc_detach(device_t self, int flags)
mutex_destroy(&sc->sc_mii_lock);
- return (0);
+ return 0;
}
void
@@ -1229,7 +1229,7 @@ smsc_activate(device_t self, enum devact
default:
return EOPNOTSUPP;
}
- return (0);
+ return 0;
}
void
@@ -1480,17 +1480,17 @@ smsc_tx_list_init(struct smsc_softc *sc)
if (c->sc_xfer == NULL) {
c->sc_xfer = usbd_alloc_xfer(sc->sc_udev);
if (c->sc_xfer == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
c->sc_buf = usbd_alloc_buffer(c->sc_xfer,
sc->sc_bufsz);
if (c->sc_buf == NULL) {
usbd_free_xfer(c->sc_xfer);
- return (ENOBUFS);
+ return ENOBUFS;
}
}
}
- return (0);
+ return 0;
}
int
@@ -1509,17 +1509,17 @@ smsc_rx_list_init(struct smsc_softc *sc)
if (c->sc_xfer == NULL) {
c->sc_xfer = usbd_alloc_xfer(sc->sc_udev);
if (c->sc_xfer == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
c->sc_buf = usbd_alloc_buffer(c->sc_xfer,
sc->sc_bufsz);
if (c->sc_buf == NULL) {
usbd_free_xfer(c->sc_xfer);
- return (ENOBUFS);
+ return ENOBUFS;
}
}
}
- return (0);
+ return 0;
}
struct mbuf *
@@ -1529,15 +1529,15 @@ smsc_newbuf(void)
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (m == NULL)
- return (NULL);
+ return NULL;
MCLGET(m, M_DONTWAIT);
if (!(m->m_flags & M_EXT)) {
m_freem(m);
- return (NULL);
+ return NULL;
}
- return (m);
+ return m;
}
int
@@ -1580,10 +1580,10 @@ smsc_encap(struct smsc_softc *sc, struct
/* XXXNH get task to stop interface */
if (err != USBD_IN_PROGRESS) {
smsc_stop(ifp, 0);
- return (EIO);
+ return EIO;
}
sc->sc_cdata.tx_cnt++;
- return (0);
+ return 0;
}
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.9.4.1 src/sys/dev/usb/if_urndis.c:1.9.4.2
--- src/sys/dev/usb/if_urndis.c:1.9.4.1 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_urndis.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.9.4.1 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_urndis.c,v 1.9.4.2 2014/12/23 11:24:32 skrll Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9.4.1 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9.4.2 2014/12/23 11:24:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -892,20 +892,20 @@ urndis_newbuf(struct urndis_softc *sc, s
if (m_new == NULL) {
printf("%s: no memory for rx list -- packet dropped!\n",
DEVNAME(sc));
- return (ENOBUFS);
+ return ENOBUFS;
}
MCLGET(m_new, M_DONTWAIT);
if (!(m_new->m_flags & M_EXT)) {
printf("%s: no memory for rx list -- packet dropped!\n",
DEVNAME(sc));
m_freem(m_new);
- return (ENOBUFS);
+ return ENOBUFS;
}
m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
m_adj(m_new, ETHER_ALIGN);
c->sc_mbuf = m_new;
- return (0);
+ return 0;
}
static int
@@ -922,20 +922,20 @@ urndis_rx_list_init(struct urndis_softc
c->sc_idx = i;
if (urndis_newbuf(sc, c) == ENOBUFS)
- return (ENOBUFS);
+ return ENOBUFS;
if (c->sc_xfer == NULL) {
c->sc_xfer = usbd_alloc_xfer(sc->sc_udev);
if (c->sc_xfer == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
c->sc_buf = usbd_alloc_buffer(c->sc_xfer,
RNDIS_BUFSZ);
if (c->sc_buf == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
}
}
- return (0);
+ return 0;
}
static int
@@ -954,14 +954,14 @@ urndis_tx_list_init(struct urndis_softc
if (c->sc_xfer == NULL) {
c->sc_xfer = usbd_alloc_xfer(sc->sc_udev);
if (c->sc_xfer == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
c->sc_buf = usbd_alloc_buffer(c->sc_xfer,
RNDIS_BUFSZ);
if (c->sc_buf == NULL)
- return (ENOBUFS);
+ return ENOBUFS;
}
}
- return (0);
+ return 0;
}
static int
@@ -974,7 +974,7 @@ urndis_ioctl(struct ifnet *ifp, unsigned
error = 0;
if (sc->sc_dying)
- return (EIO);
+ return EIO;
s = splnet();
@@ -1001,7 +1001,7 @@ urndis_ioctl(struct ifnet *ifp, unsigned
error = 0;
splx(s);
- return (error);
+ return error;
}
#if 0
@@ -1297,18 +1297,18 @@ urndis_match(device_t parent, cfdata_t m
uaa = aux;
if (!uaa->iface)
- return (UMATCH_NONE);
+ return UMATCH_NONE;
id = usbd_get_interface_descriptor(uaa->iface);
if (id == NULL)
- return (UMATCH_NONE);
+ return UMATCH_NONE;
if (id->bInterfaceClass == UICLASS_WIRELESS &&
id->bInterfaceSubClass == UISUBCLASS_RF &&
id->bInterfaceProtocol == UIPROTO_RNDIS)
- return (UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO);
+ return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO;
- return (usb_lookup(urndis_devs, uaa->vendor, uaa->product) != NULL) ?
+ return usb_lookup(urndis_devs, uaa->vendor, uaa->product) != NULL ?
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.6.6.4 src/sys/dev/usb/if_urtw.c:1.6.6.5
--- src/sys/dev/usb/if_urtw.c:1.6.6.4 Sat Dec 6 08:27:23 2014
+++ src/sys/dev/usb/if_urtw.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.6.6.4 2014/12/06 08:27:23 skrll Exp $ */
+/* $NetBSD: if_urtw.c,v 1.6.6.5 2014/12/23 11:24:32 skrll Exp $ */
/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.6.6.4 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.6.6.5 2014/12/23 11:24:32 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -591,7 +591,7 @@ urtw_match(device_t parent, cfdata_t mat
{
struct usb_attach_arg *uaa = aux;
- return (urtw_lookup(uaa->vendor, uaa->product) != NULL) ?
+ return urtw_lookup(uaa->vendor, uaa->product) != NULL ?
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.34.4.4 src/sys/dev/usb/if_urtwn.c:1.34.4.5
--- src/sys/dev/usb/if_urtwn.c:1.34.4.4 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/if_urtwn.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.34.4.4 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.34.4.5 2014/12/23 11:24:32 skrll Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.34.4.4 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.34.4.5 2014/12/23 11:24:32 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -285,7 +285,7 @@ urtwn_match(device_t parent, cfdata_t ma
{
struct usb_attach_arg *uaa = aux;
- return (urtwn_lookup(urtwn_devs, uaa->vendor, uaa->product) != NULL) ?
+ return urtwn_lookup(urtwn_devs, uaa->vendor, uaa->product) != NULL ?
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
Index: src/sys/dev/usb/moscom.c
diff -u src/sys/dev/usb/moscom.c:1.8.14.2 src/sys/dev/usb/moscom.c:1.8.14.3
--- src/sys/dev/usb/moscom.c:1.8.14.2 Tue Dec 23 11:10:41 2014
+++ src/sys/dev/usb/moscom.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: moscom.c,v 1.8.14.2 2014/12/23 11:10:41 skrll Exp $ */
+/* $NetBSD: moscom.c,v 1.8.14.3 2014/12/23 11:24:32 skrll Exp $ */
/* $OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.8.14.2 2014/12/23 11:10:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.8.14.3 2014/12/23 11:24:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -298,7 +298,7 @@ moscom_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
@@ -322,16 +322,16 @@ moscom_open(void *vsc, int portno)
usb_device_request_t req;
if (sc->sc_dying)
- return (EIO);
+ return EIO;
/* Purge FIFOs or odd things happen */
if (moscom_cmd(sc, MOSCOM_FIFO, 0x00) != 0)
- return (EIO);
+ return EIO;
if (moscom_cmd(sc, MOSCOM_FIFO, MOSCOM_FIFO_EN |
MOSCOM_FIFO_RXCLR | MOSCOM_FIFO_TXCLR |
MOSCOM_FIFO_DMA_BLK | MOSCOM_FIFO_RXLVL_MASK) != 0)
- return (EIO);
+ return EIO;
/* Magic tell device we're ready for data command */
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
@@ -340,9 +340,9 @@ moscom_open(void *vsc, int portno)
USETW(req.wIndex, MOSCOM_INT);
USETW(req.wLength, 0);
if (usbd_do_request(sc->sc_udev, &req, NULL) != 0)
- return (EIO);
+ return EIO;
- return (0);
+ return 0;
}
void
@@ -378,12 +378,12 @@ moscom_param(void *vsc, int portno, stru
int data;
if (t->c_ospeed <= 0 || t->c_ospeed > 115200)
- return (EINVAL);
+ return EINVAL;
data = MOSCOM_BAUD_REF / t->c_ospeed;
if (data == 0 || data > 0xffff)
- return (EINVAL);
+ return EINVAL;
moscom_cmd(sc, MOSCOM_LCR, MOSCOM_LCR_DIVLATCH_EN);
moscom_cmd(sc, MOSCOM_BAUDLO, data & 0xFF);
@@ -429,7 +429,7 @@ moscom_param(void *vsc, int portno, stru
}
#endif
- return (0);
+ return 0;
}
void
@@ -456,7 +456,7 @@ moscom_cmd(struct moscom_softc *sc, int
USETW(req.wLength, 0);
err = usbd_do_request(sc->sc_udev, &req, NULL);
if (err)
- return (EIO);
+ return EIO;
else
- return (0);
+ return 0;
}
Index: src/sys/dev/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.31.2.6 src/sys/dev/usb/u3g.c:1.31.2.7
--- src/sys/dev/usb/u3g.c:1.31.2.6 Sat Dec 6 08:37:30 2014
+++ src/sys/dev/usb/u3g.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.31.2.6 2014/12/06 08:37:30 skrll Exp $ */
+/* $NetBSD: u3g.c,v 1.31.2.7 2014/12/23 11:24:32 skrll Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.31.2.6 2014/12/06 08:37:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.31.2.7 2014/12/23 11:24:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -712,7 +712,7 @@ u3g_match(device_t parent, cfdata_t matc
*
* XXX: this may be too generalised.
*/
- return (id->bInterfaceClass == UICLASS_VENDOR) ?
+ return id->bInterfaceClass == UICLASS_VENDOR ?
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.108.2.3 src/sys/dev/usb/ucom.c:1.108.2.4
--- src/sys/dev/usb/ucom.c:1.108.2.3 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/ucom.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.108.2.3 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: ucom.c,v 1.108.2.4 2014/12/23 11:24:32 skrll Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.3 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.4 2014/12/23 11:24:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -697,7 +697,7 @@ ucomtty(dev_t dev)
{
struct ucom_softc *sc = device_lookup_private(&ucom_cd, UCOMUNIT(dev));
- return (sc != NULL) ? sc->sc_tty : NULL;
+ return sc != NULL ? sc->sc_tty : NULL;
}
int
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.49.2.1 src/sys/dev/usb/umass_scsipi.c:1.49.2.2
--- src/sys/dev/usb/umass_scsipi.c:1.49.2.1 Sat Dec 6 08:27:23 2014
+++ src/sys/dev/usb/umass_scsipi.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.49.2.1 2014/12/06 08:27:23 skrll Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.49.2.2 2014/12/23 11:24:32 skrll Exp $ */
/*
* Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.49.2.1 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.49.2.2 2014/12/23 11:24:32 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -142,7 +142,7 @@ umass_scsi_attach(struct umass_softc *sc
if (--sc->sc_refcnt < 0)
usb_detach_wakeupold(sc->sc_dev);
- return (0);
+ return 0;
}
#endif
@@ -170,7 +170,7 @@ umass_atapi_attach(struct umass_softc *s
if (--sc->sc_refcnt < 0)
usb_detach_wakeupold(sc->sc_dev);
- return (0);
+ return 0;
}
#endif
@@ -203,7 +203,7 @@ umass_scsipi_setup(struct umass_softc *s
scbus->sc_channel.chan_max_periph = 1;
scbus->sc_channel.chan_defquirks |= sc->sc_busquirks;
- return (scbus);
+ return scbus;
}
Static void
@@ -356,10 +356,10 @@ umass_scsipi_ioctl(struct scsipi_channel
case SCBUSIORESET:
ccb->ccb_h.status = CAM_REQ_INPROG;
umass_reset(sc, umass_cam_cb, (void *) ccb);
- return (0);
+ return 0;
#endif
default:
- return (ENOTTY);
+ return ENOTTY;
}
}
@@ -372,7 +372,7 @@ umass_scsipi_getgeom(struct scsipi_perip
/* If it's not a floppy, we don't know what to do. */
if (sc->sc_cmd != UMASS_CPROTO_UFI)
- return (0);
+ return 0;
switch (sectors) {
case 1440:
@@ -380,15 +380,15 @@ umass_scsipi_getgeom(struct scsipi_perip
dp->heads = 2;
dp->sectors = 9;
dp->cyls = 80;
- return (1);
+ return 1;
case 2880:
/* Most likely a double density 3.5" floppy. */
dp->heads = 2;
dp->sectors = 18;
dp->cyls = 80;
- return (1);
+ return 1;
default:
- return (0);
+ return 0;
}
}
Index: src/sys/dev/usb/umcs.c
diff -u src/sys/dev/usb/umcs.c:1.8.2.1 src/sys/dev/usb/umcs.c:1.8.2.2
--- src/sys/dev/usb/umcs.c:1.8.2.1 Sat Dec 6 08:27:23 2014
+++ src/sys/dev/usb/umcs.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.c,v 1.8.2.1 2014/12/06 08:27:23 skrll Exp $ */
+/* $NetBSD: umcs.c,v 1.8.2.2 2014/12/23 11:24:32 skrll Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
/*-
@@ -41,7 +41,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.8.2.1 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.8.2.2 2014/12/23 11:24:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,8 +174,8 @@ umcs7840_match(device_t dev, cfdata_t ma
{
struct usb_attach_arg *uaa = aux;
- return (umcs7840_lookup(uaa->vendor, uaa->product) != NULL ?
- UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+ return umcs7840_lookup(uaa->vendor, uaa->product) != NULL ?
+ UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
static void
@@ -432,12 +432,12 @@ umcs7840_set_baudrate(struct umcs7840_so
if (umcs7840_calc_baudrate(rate, &divisor, &clk)) {
DPRINTF(("Port %d bad speed: %d\n", portno, rate));
- return (-1);
+ return -1;
}
if (divisor == 0 || (clk & MCS7840_DEV_SPx_CLOCK_MASK) != clk) {
DPRINTF(("Port %d bad speed calculation: %d\n", portno,
rate));
- return (-1);
+ return -1;
}
DPRINTF(("Port %d set speed: %d (%02x / %d)\n", portno, rate, clk, divisor));
@@ -469,7 +469,7 @@ umcs7840_set_baudrate(struct umcs7840_so
err = umcs7840_set_UART_reg(sc, physport, MCS7840_UART_REG_LCR, sc->sc_ports[portno].sc_port_lcr);
if (err)
return err;
- return (0);
+ return 0;
}
static int
@@ -484,7 +484,7 @@ umcs7840_calc_baudrate(uint32_t rate, ui
uint8_t i = 0;
if (rate > umcs7840_baudrate_divisors[umcs7840_baudrate_divisors_len - 1])
- return (-1);
+ return -1;
for (i = 0; i < umcs7840_baudrate_divisors_len - 1
&& !(rate > umcs7840_baudrate_divisors[i]
@@ -492,7 +492,7 @@ umcs7840_calc_baudrate(uint32_t rate, ui
*divisor = umcs7840_baudrate_divisors[i + 1] / rate;
/* 0x00 .. 0x70 */
*clk = i << MCS7840_DEV_SPx_CLOCK_SHIFT;
- return (0);
+ return 0;
}
static int
Index: src/sys/dev/usb/umodem.c
diff -u src/sys/dev/usb/umodem.c:1.66.4.2 src/sys/dev/usb/umodem.c:1.66.4.3
--- src/sys/dev/usb/umodem.c:1.66.4.2 Tue Dec 23 11:10:41 2014
+++ src/sys/dev/usb/umodem.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem.c,v 1.66.4.2 2014/12/23 11:10:41 skrll Exp $ */
+/* $NetBSD: umodem.c,v 1.66.4.3 2014/12/23 11:24:32 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66.4.2 2014/12/23 11:10:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66.4.3 2014/12/23 11:24:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,17 +102,17 @@ umodem_match(device_t parent, cfdata_t m
if (uaa->subclass != UISUBCLASS_ABSTRACT_CONTROL_MODEL &&
(id->bInterfaceClass == UICLASS_CDC_DATA &&
id->bInterfaceSubClass == UISUBCLASS_DATA))
- return (UMATCH_IFACECLASS_IFACESUBCLASS);
+ return UMATCH_IFACECLASS_IFACESUBCLASS;
if (uaa->class != UICLASS_CDC ||
uaa->subclass != UISUBCLASS_ABSTRACT_CONTROL_MODEL ||
!(uaa->proto == UIPROTO_CDC_NOCLASS || uaa->proto == UIPROTO_CDC_AT))
- return (UMATCH_NONE);
+ return UMATCH_NONE;
if (umodem_get_caps(uaa->device, &cm, &acm, id) == -1)
- return (UMATCH_NONE);
+ return UMATCH_NONE;
- return (UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO);
+ return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO;
}
void
Index: src/sys/dev/usb/uthum.c
diff -u src/sys/dev/usb/uthum.c:1.10.14.1 src/sys/dev/usb/uthum.c:1.10.14.2
--- src/sys/dev/usb/uthum.c:1.10.14.1 Wed Dec 3 22:33:56 2014
+++ src/sys/dev/usb/uthum.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.10.14.1 2014/12/03 22:33:56 skrll Exp $ */
+/* $NetBSD: uthum.c,v 1.10.14.2 2014/12/23 11:24:32 skrll Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.10.14.1 2014/12/03 22:33:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.10.14.2 2014/12/23 11:24:32 skrll Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -120,8 +120,8 @@ uthum_match(device_t parent, cfdata_t ma
struct usb_attach_arg *uaa = aux;
struct uhidev_attach_arg *uha = (struct uhidev_attach_arg *)uaa;
- return (uthum_lookup(uha->uaa->vendor, uha->uaa->product) != NULL ?
- UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+ return uthum_lookup(uha->uaa->vendor, uha->uaa->product) != NULL ?
+ UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
void
@@ -229,7 +229,7 @@ uthum_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
@@ -242,7 +242,7 @@ uthum_activate(device_t self, enum devac
sc->sc_dying = 1;
break;
}
- return (0);
+ return 0;
}
void
Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.41.2.5 src/sys/dev/usb/uvideo.c:1.41.2.6
--- src/sys/dev/usb/uvideo.c:1.41.2.5 Sat Dec 6 08:27:23 2014
+++ src/sys/dev/usb/uvideo.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.41.2.5 2014/12/06 08:27:23 skrll Exp $ */
+/* $NetBSD: uvideo.c,v 1.41.2.6 2014/12/23 11:24:32 skrll Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41.2.5 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41.2.6 2014/12/23 11:24:32 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -761,7 +761,7 @@ uvideo_stream_guess_format(struct uvideo
static struct uvideo_stream *
uvideo_stream_alloc(void)
{
- return (kmem_alloc(sizeof(struct uvideo_stream), KM_NOSLEEP));
+ return kmem_alloc(sizeof(struct uvideo_stream), KM_NOSLEEP);
}
@@ -3020,7 +3020,7 @@ usb_desc_iter_next_non_interface(usbd_de
if ((desc = usb_desc_iter_peek_next(iter)) != NULL &&
desc->bDescriptorType != UDESC_INTERFACE)
{
- return (usb_desc_iter_next(iter));
+ return usb_desc_iter_next(iter);
} else {
return NULL;
}
@@ -3067,5 +3067,5 @@ usb_guid_cmp(const usb_guid_t *uguid, co
else if (guid->data3 < UGETW(uguid->data3))
return -1;
- return (memcmp(guid->data4, uguid->data4, 8));
+ return memcmp(guid->data4, uguid->data4, 8);
}
Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.28.16.3 src/sys/dev/usb/uvscom.c:1.28.16.4
--- src/sys/dev/usb/uvscom.c:1.28.16.3 Tue Dec 23 11:10:41 2014
+++ src/sys/dev/usb/uvscom.c Tue Dec 23 11:24:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.28.16.3 2014/12/23 11:10:41 skrll Exp $ */
+/* $NetBSD: uvscom.c,v 1.28.16.4 2014/12/23 11:24:32 skrll Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <[email protected]>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.16.3 2014/12/23 11:10:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.16.4 2014/12/23 11:24:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -223,8 +223,8 @@ uvscom_match(device_t parent, cfdata_t m
{
struct usb_attach_arg *uaa = aux;
- return (uvscom_lookup(uaa->vendor, uaa->product) != NULL ?
- UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+ return uvscom_lookup(uaa->vendor, uaa->product) != NULL ?
+ UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
void
@@ -399,7 +399,7 @@ uvscom_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
@@ -435,13 +435,13 @@ uvscom_readstat(struct uvscom_softc *sc)
if (err) {
aprint_error_dev(sc->sc_dev, "uvscom_readstat: %s\n",
usbd_errstr(err));
- return (err);
+ return err;
}
DPRINTF(("%s: uvscom_readstat: r = %d\n",
device_xname(sc->sc_dev), r));
- return (USBD_NORMAL_COMPLETION);
+ return USBD_NORMAL_COMPLETION;
}
Static usbd_status
@@ -462,10 +462,10 @@ uvscom_shutdown(struct uvscom_softc *sc)
if (err) {
aprint_error_dev(sc->sc_dev, "uvscom_shutdown: %s\n",
usbd_errstr(err));
- return (err);
+ return err;
}
- return (USBD_NORMAL_COMPLETION);
+ return USBD_NORMAL_COMPLETION;
}
Static usbd_status
@@ -473,7 +473,7 @@ uvscom_reset(struct uvscom_softc *sc)
{
DPRINTF(("%s: uvscom_reset\n", device_xname(sc->sc_dev)));
- return (USBD_NORMAL_COMPLETION);
+ return USBD_NORMAL_COMPLETION;
}
Static usbd_status
@@ -481,7 +481,7 @@ uvscom_set_crtscts(struct uvscom_softc *
{
DPRINTF(("%s: uvscom_set_crtscts\n", device_xname(sc->sc_dev)));
- return (USBD_NORMAL_COMPLETION);
+ return USBD_NORMAL_COMPLETION;
}
Static usbd_status
@@ -503,10 +503,10 @@ uvscom_set_line(struct uvscom_softc *sc,
if (err) {
aprint_error_dev(sc->sc_dev, "uvscom_set_line: %s\n",
usbd_errstr(err));
- return (err);
+ return err;
}
- return (USBD_NORMAL_COMPLETION);
+ return USBD_NORMAL_COMPLETION;
}
Static usbd_status
@@ -528,7 +528,7 @@ uvscom_set_line_coding(struct uvscom_sof
if (err) {
aprint_error_dev(sc->sc_dev, "uvscom_set_line_coding: %s\n",
usbd_errstr(err));
- return (err);
+ return err;
}
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
@@ -541,10 +541,10 @@ uvscom_set_line_coding(struct uvscom_sof
if (err) {
aprint_error_dev(sc->sc_dev, "uvscom_set_line_coding: %s\n",
usbd_errstr(err));
- return (err);
+ return err;
}
- return (USBD_NORMAL_COMPLETION);
+ return USBD_NORMAL_COMPLETION;
}
Static void
@@ -663,7 +663,7 @@ uvscom_param(void *addr, int portno, str
lsp = UVSCOM_SPEED_115200BPS;
break;
default:
- return (EIO);
+ return EIO;
}
if (ISSET(t->c_cflag, CSTOPB))
@@ -693,20 +693,20 @@ uvscom_param(void *addr, int portno, str
SET(ls, UVSCOM_DATA_BIT_8);
break;
default:
- return (EIO);
+ return EIO;
}
err = uvscom_set_line_coding(sc, lsp, ls);
if (err)
- return (EIO);
+ return EIO;
if (ISSET(t->c_cflag, CRTSCTS)) {
err = uvscom_set_crtscts(sc);
if (err)
- return (EIO);
+ return EIO;
}
- return (0);
+ return 0;
}
Static int
@@ -717,7 +717,7 @@ uvscom_open(void *addr, int portno)
int i;
if (sc->sc_dying)
- return (EIO);
+ return EIO;
DPRINTF(("uvscom_open: sc = %p\n", sc));
@@ -730,7 +730,7 @@ uvscom_open(void *addr, int portno)
if (err) {
DPRINTF(("%s: uvscom_open: readstat faild\n",
device_xname(sc->sc_dev)));
- return (EIO);
+ return EIO;
}
sc->sc_intr_buf = kmem_alloc(sc->sc_isize, KM_SLEEP);
@@ -747,7 +747,7 @@ uvscom_open(void *addr, int portno)
aprint_error_dev(sc->sc_dev,
"cannot open interrupt pipe (addr %d)\n",
sc->sc_intr_number);
- return (EIO);
+ return EIO;
}
} else {
DPRINTF(("uvscom_open: did not open interrupt pipe.\n"));
@@ -764,18 +764,18 @@ uvscom_open(void *addr, int portno)
if (i == 0) {
DPRINTF(("%s: unit is not ready\n",
device_xname(sc->sc_dev)));
- return (EIO);
+ return EIO;
}
/* check PC card was inserted */
if (ISSET(sc->sc_usr, UVSCOM_NOCARD)) {
DPRINTF(("%s: no card\n",
device_xname(sc->sc_dev)));
- return (EIO);
+ return EIO;
}
}
- return (0);
+ return 0;
}
Static void
