Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nick-nhusb]: src/sys/dev/usb Remove the lbl argument from usbd_{bulk, int...
details: https://anonhg.NetBSD.org/src/rev/3dd02382df7b
branches: nick-nhusb
changeset: 334058:3dd02382df7b
user: skrll <skrll%NetBSD.org@localhost>
date: Mon Dec 01 13:03:05 2014 +0000
description:
Remove the lbl argument from usbd_{bulk,intr}_transfer.
diffstat:
sys/dev/usb/aubtfwl.c | 6 +++---
sys/dev/usb/if_upgt.c | 7 +++----
sys/dev/usb/irmce.c | 10 ++++------
sys/dev/usb/pseye.c | 6 +++---
sys/dev/usb/stuirda.c | 8 ++++----
sys/dev/usb/udl.c | 6 +++---
sys/dev/usb/udsir.c | 6 +++---
sys/dev/usb/ugen.c | 10 +++++-----
sys/dev/usb/uhidev.c | 6 +++---
sys/dev/usb/uirda.c | 8 ++++----
sys/dev/usb/ulpt.c | 8 ++++----
sys/dev/usb/urio.c | 8 ++++----
sys/dev/usb/usbdi_util.c | 8 ++++----
sys/dev/usb/usbdi_util.h | 6 +++---
sys/dev/usb/uscanner.c | 10 ++++------
sys/dev/usb/ustir.c | 6 +++---
sys/dev/usb/uvideo.c | 6 +++---
17 files changed, 60 insertions(+), 65 deletions(-)
diffs (truncated from 539 to 300 lines):
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/aubtfwl.c
--- a/sys/dev/usb/aubtfwl.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/aubtfwl.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 @@
}
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));
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/if_upgt.c
--- a/sys/dev/usb/if_upgt.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/if_upgt.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 @@
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));
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/irmce.c
--- a/sys/dev/usb/irmce.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/irmce.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
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 @@
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;
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/pseye.c
--- a/sys/dev/usb/pseye.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/pseye.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
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
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/stuirda.c
--- a/sys/dev/usb/stuirda.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/stuirda.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 @@
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 @@
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)
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/udl.c
--- a/sys/dev/usb/udl.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/udl.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 @@
/* 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);
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/udsir.c
--- a/sys/dev/usb/udsir.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/udsir.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 @@
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)
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/ugen.c
--- a/sys/dev/usb/ugen.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/ugen.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 @@
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 @@
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 @@
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;
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/uhidev.c
--- a/sys/dev/usb/uhidev.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/uhidev.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 @@
}
#endif
return usbd_intr_transfer(sc->sc_oxfer, sc->sc_opipe, 0,
- USBD_NO_TIMEOUT, data, &len, "uhidevwi");
+ USBD_NO_TIMEOUT, data, &len);
}
diff -r 0e98c51fff35 -r 3dd02382df7b sys/dev/usb/uirda.c
--- a/sys/dev/usb/uirda.c Mon Dec 01 12:38:39 2014 +0000
+++ b/sys/dev/usb/uirda.c Mon Dec 01 13:03:05 2014 +0000
@@ -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 @@
err = usbd_bulk_transfer(sc->sc_wr_xfer, sc->sc_wr_pipe,
Home |
Main Index |
Thread Index |
Old Index