Module Name: src
Committed By: skrll
Date: Mon Dec 1 13:03:05 UTC 2014
Modified Files:
src/sys/dev/usb [nick-nhusb]: aubtfwl.c if_upgt.c irmce.c pseye.c
stuirda.c udl.c udsir.c ugen.c uhidev.c uirda.c ulpt.c urio.c
usbdi_util.c usbdi_util.h uscanner.c ustir.c uvideo.c
Log Message:
Remove the lbl argument from usbd_{bulk,intr}_transfer.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.10.1 src/sys/dev/usb/aubtfwl.c
cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.1 -r1.1.32.1 src/sys/dev/usb/irmce.c
cvs rdiff -u -r1.21 -r1.21.34.1 src/sys/dev/usb/pseye.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/sys/dev/usb/stuirda.c
cvs rdiff -u -r1.11 -r1.11.6.1 src/sys/dev/usb/udl.c
cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.126.2.1 -r1.126.2.2 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.61.4.1 -r1.61.4.2 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.38.6.1 -r1.38.6.2 src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.95.4.1 -r1.95.4.2 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.42.4.1 -r1.42.4.2 src/sys/dev/usb/urio.c
cvs rdiff -u -r1.63.2.2 -r1.63.2.3 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.45.6.1 -r1.45.6.2 src/sys/dev/usb/usbdi_util.h
cvs rdiff -u -r1.75.4.2 -r1.75.4.3 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.33.10.1 -r1.33.10.2 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/dev/usb/uvideo.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/aubtfwl.c
diff -u src/sys/dev/usb/aubtfwl.c:1.5 src/sys/dev/usb/aubtfwl.c:1.5.10.1
--- src/sys/dev/usb/aubtfwl.c:1.5 Thu May 9 12:44:31 2013
+++ src/sys/dev/usb/aubtfwl.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: aubtfwl.c,v 1.5 2013/05/09 12:44:31 aymeric Exp $ */
+/* $NetBSD: aubtfwl.c,v 1.5.10.1 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.5 2013/05/09 12:44:31 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.5.10.1 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <dev/usb/usb.h>
@@ -192,7 +192,7 @@ aubtfwl_firmware_load(device_t self, con
}
error = usbd_bulk_transfer(xfer, pipe,
USBD_NO_COPY, USBD_DEFAULT_TIMEOUT,
- buf, &n, device_xname(self));
+ buf, &n);
if (error != USBD_NORMAL_COMPLETION) {
aprint_error_dev(self, "xfer failed, %s\n",
usbd_errstr(error));
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.12 src/sys/dev/usb/if_upgt.c:1.12.4.1
--- src/sys/dev/usb/if_upgt.c:1.12 Tue May 27 13:44:25 2014
+++ src/sys/dev/usb/if_upgt.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.12 2014/05/27 13:44:25 ryoon Exp $ */
+/* $NetBSD: if_upgt.c,v 1.12.4.1 2014/12/01 13:03:05 skrll Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.12 2014/05/27 13:44:25 ryoon Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.12.4.1 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -2366,8 +2366,7 @@ upgt_bulk_xmit(struct upgt_softc *sc, st
usbd_status status;
status = usbd_bulk_transfer(data->xfer, pipeh,
- USBD_NO_COPY | flags, UPGT_USB_TIMEOUT, data->buf, size,
- "upgt_bulk_xmit");
+ USBD_NO_COPY | flags, UPGT_USB_TIMEOUT, data->buf, size);
if (status != USBD_NORMAL_COMPLETION) {
aprint_error_dev(sc->sc_dev, "%s: error %s\n", __func__,
usbd_errstr(status));
Index: src/sys/dev/usb/irmce.c
diff -u src/sys/dev/usb/irmce.c:1.1 src/sys/dev/usb/irmce.c:1.1.32.1
--- src/sys/dev/usb/irmce.c:1.1 Tue Jul 19 12:23:04 2011
+++ src/sys/dev/usb/irmce.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: irmce.c,v 1.1 2011/07/19 12:23:04 jmcneill Exp $ */
+/* $NetBSD: irmce.c,v 1.1.32.1 2014/12/01 13:03:05 skrll Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irmce.c,v 1.1 2011/07/19 12:23:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irmce.c,v 1.1.32.1 2014/12/01 13:03:05 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -306,8 +306,7 @@ irmce_reset(struct irmce_softc *sc)
wlen = sizeof(reset_cmd);
err = usbd_bulk_transfer(sc->sc_bulkin_xfer,
sc->sc_bulkout_pipe, USBD_NO_COPY|USBD_FORCE_SHORT_XFER,
- USBD_DEFAULT_TIMEOUT, sc->sc_bulkout_buffer, &wlen,
- "irmcereset");
+ USBD_DEFAULT_TIMEOUT, sc->sc_bulkout_buffer, &wlen);
if (err != USBD_NORMAL_COMPLETION) {
if (err == USBD_INTERRUPTED)
return EINTR;
@@ -553,8 +552,7 @@ irmce_read(void *priv, struct uio *uio,
rlen = sc->sc_bulkin_maxpktsize;
err = usbd_bulk_transfer(sc->sc_bulkin_xfer,
sc->sc_bulkin_pipe, USBD_NO_COPY|USBD_SHORT_XFER_OK,
- USBD_DEFAULT_TIMEOUT, sc->sc_bulkin_buffer, &rlen,
- "irmcerd");
+ USBD_DEFAULT_TIMEOUT, sc->sc_bulkin_buffer, &rlen);
if (err != USBD_NORMAL_COMPLETION) {
if (err == USBD_INTERRUPTED)
return EINTR;
Index: src/sys/dev/usb/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.21 src/sys/dev/usb/pseye.c:1.21.34.1
--- src/sys/dev/usb/pseye.c:1.21 Tue May 24 16:42:31 2011
+++ src/sys/dev/usb/pseye.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.21 2011/05/24 16:42:31 joerg Exp $ */
+/* $NetBSD: pseye.c,v 1.21.34.1 2014/12/01 13:03:05 skrll Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill <[email protected]>
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.21 2011/05/24 16:42:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.21.34.1 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -623,7 +623,7 @@ pseye_get_frame(struct pseye_softc *sc,
return usbd_bulk_transfer(sc->sc_bulkin_xfer, sc->sc_bulkin_pipe,
USBD_SHORT_XFER_OK|USBD_NO_COPY, 1000,
- sc->sc_bulkin_buffer, plen, "pseyerb");
+ sc->sc_bulkin_buffer, plen);
}
static int
Index: src/sys/dev/usb/stuirda.c
diff -u src/sys/dev/usb/stuirda.c:1.16.2.1 src/sys/dev/usb/stuirda.c:1.16.2.2
--- src/sys/dev/usb/stuirda.c:1.16.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/stuirda.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: stuirda.c,v 1.16.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: stuirda.c,v 1.16.2.2 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 2001,2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.16.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.16.2.2 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
@@ -247,7 +247,7 @@ stuirda_fwload(struct uirda_softc *sc) {
memcpy(usbbuf, p, n);
rc = usbd_bulk_transfer(fwxfer, fwpipe,
USBD_SYNCHRONOUS|USBD_FORCE_SHORT_XFER,
- 5000, usbbuf, &n, "uirda-fw-wr");
+ 5000, usbbuf, &n);
printf("%s: write: rc=%d, %d left\n",
device_xname(sc->sc_dev), rc, n);
if (rc) {
@@ -314,7 +314,7 @@ stuirda_write(void *h, struct uio *uio,
err = usbd_bulk_transfer(sc->sc_wr_xfer, sc->sc_wr_pipe,
USBD_FORCE_SHORT_XFER|USBD_NO_COPY,
UIRDA_WR_TIMEOUT,
- sc->sc_wr_buf, &n, "uirdawr");
+ sc->sc_wr_buf, &n);
DPRINTFN(2, ("uirdawrite: err=%d\n", err));
if (err) {
if (err == USBD_INTERRUPTED)
Index: src/sys/dev/usb/udl.c
diff -u src/sys/dev/usb/udl.c:1.11 src/sys/dev/usb/udl.c:1.11.6.1
--- src/sys/dev/usb/udl.c:1.11 Sun Feb 23 13:22:32 2014
+++ src/sys/dev/usb/udl.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udl.c,v 1.11 2014/02/23 13:22:32 skrll Exp $ */
+/* $NetBSD: udl.c,v 1.11.6.1 2014/12/01 13:03:05 skrll Exp $ */
/*-
* Copyright (c) 2009 FUKAUMI Naoki.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.11 2014/02/23 13:22:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.11.6.1 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -1430,7 +1430,7 @@ udl_cmd_send(struct udl_softc *sc)
/* do xfer */
error = usbd_bulk_transfer(cmdq->cq_xfer, sc->sc_tx_pipeh,
- USBD_NO_COPY, USBD_NO_TIMEOUT, cmdq->cq_buf, &len, "udlcmds");
+ USBD_NO_COPY, USBD_NO_TIMEOUT, cmdq->cq_buf, &len);
UDL_CMD_BUFINIT(sc);
Index: src/sys/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.1 src/sys/dev/usb/udsir.c:1.1.14.1
--- src/sys/dev/usb/udsir.c:1.1 Tue May 28 12:03:26 2013
+++ src/sys/dev/usb/udsir.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udsir.c,v 1.1 2013/05/28 12:03:26 kiyohara Exp $ */
+/* $NetBSD: udsir.c,v 1.1.14.1 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1 2013/05/28 12:03:26 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.14.1 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -605,7 +605,7 @@ udsir_write(void *h, struct uio *uio, in
err = usbd_intr_transfer(sc->sc_wr_xfer, sc->sc_wr_pipe,
USBD_FORCE_SHORT_XFER | USBD_NO_COPY,
- UDSIR_WR_TIMEOUT, wrbuf, &btlen, "udsiwr");
+ UDSIR_WR_TIMEOUT, wrbuf, &btlen);
DPRINTFN(2, ("%s: err=%d\n", __func__, err));
if (err != USBD_NORMAL_COMPLETION) {
if (err == USBD_INTERRUPTED)
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.126.2.1 src/sys/dev/usb/ugen.c:1.126.2.2
--- src/sys/dev/usb/ugen.c:1.126.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ugen.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.126.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ugen.c,v 1.126.2.2 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.126.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.126.2.2 2014/12/01 13:03:05 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -724,7 +724,7 @@ ugen_do_read(struct ugen_softc *sc, int
xfer, sce->pipeh,
sce->state & UGEN_SHORT_OK ?
USBD_SHORT_XFER_OK : 0,
- sce->timeout, sc->sc_buffer, &tn, "ugenrb");
+ sce->timeout, sc->sc_buffer, &tn);
if (err) {
if (err == USBD_INTERRUPTED)
error = EINTR;
@@ -937,7 +937,7 @@ ugen_do_write(struct ugen_softc *sc, int
break;
DPRINTFN(1, ("ugenwrite: transfer %d bytes\n", n));
err = usbd_bulk_transfer(xfer, sce->pipeh, 0,
- sce->timeout, sc->sc_buffer, &n,"ugenwb");
+ sce->timeout, sc->sc_buffer, &n);
if (err) {
if (err == USBD_INTERRUPTED)
error = EINTR;
@@ -961,7 +961,7 @@ ugen_do_write(struct ugen_softc *sc, int
break;
DPRINTFN(1, ("ugenwrite: transfer %d bytes\n", n));
err = usbd_intr_transfer(xfer, sce->pipeh, 0,
- sce->timeout, sc->sc_buffer, &n, "ugenwi");
+ sce->timeout, sc->sc_buffer, &n);
if (err) {
if (err == USBD_INTERRUPTED)
error = EINTR;
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.61.4.1 src/sys/dev/usb/uhidev.c:1.61.4.2
--- src/sys/dev/usb/uhidev.c:1.61.4.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uhidev.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.61.4.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uhidev.c,v 1.61.4.2 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.61.4.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.61.4.2 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -712,5 +712,5 @@ uhidev_write(struct uhidev_softc *sc, vo
}
#endif
return usbd_intr_transfer(sc->sc_oxfer, sc->sc_opipe, 0,
- USBD_NO_TIMEOUT, data, &len, "uhidevwi");
+ USBD_NO_TIMEOUT, data, &len);
}
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.38.6.1 src/sys/dev/usb/uirda.c:1.38.6.2
--- src/sys/dev/usb/uirda.c:1.38.6.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uirda.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.38.6.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uirda.c,v 1.38.6.2 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.38.6.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.38.6.2 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -555,7 +555,7 @@ uirda_write(void *h, struct uio *uio, in
err = usbd_bulk_transfer(sc->sc_wr_xfer, sc->sc_wr_pipe,
USBD_FORCE_SHORT_XFER | USBD_NO_COPY,
UIRDA_WR_TIMEOUT,
- sc->sc_wr_buf, &n, "uirdawr");
+ sc->sc_wr_buf, &n);
DPRINTFN(2, ("uirdawrite: err=%d\n", err));
if (err) {
if (err == USBD_INTERRUPTED)
@@ -777,7 +777,7 @@ uirda_set_params(void *h, struct irda_pa
n = UIRDA_OUTPUT_HEADER_SIZE;
err = usbd_bulk_transfer(sc->sc_wr_xfer, sc->sc_wr_pipe,
USBD_FORCE_SHORT_XFER | USBD_NO_COPY,
- UIRDA_WR_TIMEOUT, sc->sc_wr_buf, &n, "uirdast");
+ UIRDA_WR_TIMEOUT, sc->sc_wr_buf, &n);
if (err) {
aprint_error_dev(sc->sc_dev, "set failed, err=%d\n",
err);
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.95.4.1 src/sys/dev/usb/ulpt.c:1.95.4.2
--- src/sys/dev/usb/ulpt.c:1.95.4.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ulpt.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.95.4.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ulpt.c,v 1.95.4.2 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.4.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.4.2 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -632,7 +632,7 @@ ulpt_do_write(struct ulpt_softc *sc, str
break;
DPRINTFN(4, ("ulptwrite: transfer %d bytes\n", n));
err = usbd_bulk_transfer(xfer, sc->sc_out_pipe, USBD_NO_COPY,
- USBD_NO_TIMEOUT, bufp, &n, "ulptwr");
+ USBD_NO_TIMEOUT, bufp, &n);
if (err) {
DPRINTFN(3, ("ulptwrite: error=%d\n", err));
error = EIO;
@@ -722,7 +722,7 @@ ulpt_do_read(struct ulpt_softc *sc, stru
n, nonblocking, timeout));
err = usbd_bulk_transfer(xfer, sc->sc_in_pipe,
USBD_NO_COPY | USBD_SHORT_XFER_OK,
- timeout, bufp, &n, "ulptrd");
+ timeout, bufp, &n);
DPRINTFN(4, ("ulptread: transfer complete nreq %d n %d nread %d err %d\n",
nreq, n, nread, err));
Index: src/sys/dev/usb/urio.c
diff -u src/sys/dev/usb/urio.c:1.42.4.1 src/sys/dev/usb/urio.c:1.42.4.2
--- src/sys/dev/usb/urio.c:1.42.4.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/urio.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.42.4.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: urio.c,v 1.42.4.2 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.42.4.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.42.4.2 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -359,7 +359,7 @@ urioread(dev_t dev, struct uio *uio, int
DPRINTFN(1, ("urioread: start transfer %d bytes\n", n));
tn = n;
err = usbd_bulk_transfer(xfer, sc->sc_in_pipe, USBD_NO_COPY,
- URIO_RW_TIMEOUT, bufp, &tn, "uriors");
+ URIO_RW_TIMEOUT, bufp, &tn);
if (err) {
if (err == USBD_INTERRUPTED)
error = EINTR;
@@ -421,7 +421,7 @@ uriowrite(dev_t dev, struct uio *uio, in
DPRINTFN(1, ("uriowrite: transfer %d bytes\n", n));
err = usbd_bulk_transfer(xfer, sc->sc_out_pipe, USBD_NO_COPY,
- URIO_RW_TIMEOUT, bufp, &n, "uriowr");
+ URIO_RW_TIMEOUT, bufp, &n);
DPRINTFN(2, ("uriowrite: err=%d\n", err));
if (err) {
if (err == USBD_INTERRUPTED)
Index: src/sys/dev/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.63.2.2 src/sys/dev/usb/usbdi_util.c:1.63.2.3
--- src/sys/dev/usb/usbdi_util.c:1.63.2.2 Sun Nov 30 13:14:11 2014
+++ src/sys/dev/usb/usbdi_util.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.c,v 1.63.2.2 2014/11/30 13:14:11 skrll Exp $ */
+/* $NetBSD: usbdi_util.c,v 1.63.2.3 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.2 2014/11/30 13:14:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.3 2014/12/01 13:03:05 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -402,7 +402,7 @@ usbd_get_config(usbd_device_handle dev,
usbd_status
usbd_bulk_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
uint16_t flags, uint32_t timeout, void *buf,
- uint32_t *size, const char *lbl)
+ uint32_t *size)
{
usbd_status err;
@@ -426,7 +426,7 @@ usbd_bulk_transfer(usbd_xfer_handle xfer
usbd_status
usbd_intr_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
uint16_t flags, uint32_t timeout, void *buf,
- uint32_t *size, const char *lbl)
+ uint32_t *size)
{
usbd_status err;
Index: src/sys/dev/usb/usbdi_util.h
diff -u src/sys/dev/usb/usbdi_util.h:1.45.6.1 src/sys/dev/usb/usbdi_util.h:1.45.6.2
--- src/sys/dev/usb/usbdi_util.h:1.45.6.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/usbdi_util.h Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.h,v 1.45.6.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: usbdi_util.h,v 1.45.6.2 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -74,11 +74,11 @@ usbd_status usbd_set_config_index(usbd_d
usbd_status usbd_bulk_transfer(usbd_xfer_handle, usbd_pipe_handle,
uint16_t, uint32_t, void *,
- uint32_t *, const char *);
+ uint32_t *);
usbd_status usbd_intr_transfer(usbd_xfer_handle, usbd_pipe_handle,
uint16_t, uint32_t, void *,
- uint32_t *, const char *);
+ uint32_t *);
void usb_detach_waitold(device_t);
void usb_detach_wakeupold(device_t);
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.75.4.2 src/sys/dev/usb/uscanner.c:1.75.4.3
--- src/sys/dev/usb/uscanner.c:1.75.4.2 Sun Nov 30 13:14:11 2014
+++ src/sys/dev/usb/uscanner.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.75.4.2 2014/11/30 13:14:11 skrll Exp $ */
+/* $NetBSD: uscanner.c,v 1.75.4.3 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.75.4.2 2014/11/30 13:14:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.75.4.3 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -506,8 +506,7 @@ uscanner_do_read(struct uscanner_softc *
err = usbd_bulk_transfer(
sc->sc_bulkin_xfer, sc->sc_bulkin_pipe,
USBD_SHORT_XFER_OK, USBD_NO_TIMEOUT,
- sc->sc_bulkin_buffer, &tn,
- "uscnrb");
+ sc->sc_bulkin_buffer, &tn);
if (err) {
if (err == USBD_INTERRUPTED)
error = EINTR;
@@ -562,8 +561,7 @@ uscanner_do_write(struct uscanner_softc
err = usbd_bulk_transfer(
sc->sc_bulkout_xfer, sc->sc_bulkout_pipe,
0, USBD_NO_TIMEOUT,
- sc->sc_bulkout_buffer, &n,
- "uscnwb");
+ sc->sc_bulkout_buffer, &n);
if (err) {
if (err == USBD_INTERRUPTED)
error = EINTR;
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.33.10.1 src/sys/dev/usb/ustir.c:1.33.10.2
--- src/sys/dev/usb/ustir.c:1.33.10.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ustir.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.33.10.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ustir.c,v 1.33.10.2 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.33.10.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.33.10.2 2014/12/01 13:03:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -986,7 +986,7 @@ ustir_write(void *h, struct uio *uio, in
err = usbd_bulk_transfer(sc->sc_wr_xfer, sc->sc_wr_pipe,
USBD_FORCE_SHORT_XFER | USBD_NO_COPY,
USTIR_WR_TIMEOUT,
- wrbuf, &btlen, "ustiwr");
+ wrbuf, &btlen);
DPRINTFN(2, ("%s: err=%d\n", __func__, err));
if (err != USBD_NORMAL_COMPLETION) {
if (err == USBD_INTERRUPTED)
Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.41 src/sys/dev/usb/uvideo.c:1.41.2.1
--- src/sys/dev/usb/uvideo.c:1.41 Fri Sep 12 16:40:38 2014
+++ src/sys/dev/usb/uvideo.c Mon Dec 1 13:03:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.41 2014/09/12 16:40:38 skrll Exp $ */
+/* $NetBSD: uvideo.c,v 1.41.2.1 2014/12/01 13:03:05 skrll Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41 2014/09/12 16:40:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41.2.1 2014/12/01 13:03:05 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1855,7 +1855,7 @@ uvideo_stream_recv_bulk_transfer(void *a
err = usbd_bulk_transfer(bx->bx_xfer, bx->bx_pipe,
USBD_SHORT_XFER_OK | USBD_NO_COPY,
USBD_NO_TIMEOUT,
- bx->bx_buffer, &len, "uvideorb");
+ bx->bx_buffer, &len);
if (err == USBD_NORMAL_COMPLETION) {
uvideo_stream_recv_process(vs, bx->bx_buffer, len);
