summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2013-04-09 08:47:57 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2013-04-09 08:47:57 +0000
commitf80190e034a708cb649b6ee6b32ed4f022e000a1 (patch)
treec84053948a78c831958ccfb8acd121ff5f551822 /sys/dev
parent8024b3fb4bf427743b360bf2fcdef4b54113a57a (diff)
When submitting a request the device's default pipe is always
used, so do not pretend to support a different one and get rid of the unused usbd_do_request_flags_pipe() function. ok mglocker@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usbdi.c14
-rw-r--r--sys/dev/usb/usbdi.h5
2 files changed, 4 insertions, 15 deletions
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 82d741c217d..b9155dbf04e 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdi.c,v 1.45 2013/03/28 03:58:03 tedu Exp $ */
+/* $OpenBSD: usbdi.c,v 1.46 2013/04/09 08:47:56 mpi Exp $ */
/* $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
@@ -953,17 +953,9 @@ usbd_do_request(usbd_device_handle dev, usb_device_request_t *req, void *data)
usbd_status
usbd_do_request_flags(usbd_device_handle dev, usb_device_request_t *req,
- void *data, u_int16_t flags, int *actlen, u_int32_t timo)
-{
- return (usbd_do_request_flags_pipe(dev, dev->default_pipe, req, data,
- flags, actlen, timo));
-}
-
-usbd_status
-usbd_do_request_flags_pipe(usbd_device_handle dev, usbd_pipe_handle pipe,
- usb_device_request_t *req, void *data, u_int16_t flags, int *actlen,
- u_int32_t timeout)
+ void *data, uint16_t flags, int *actlen, uint32_t timeout)
{
+ usbd_pipe_handle pipe = dev->default_pipe;
usbd_xfer_handle xfer;
usbd_status err;
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 913ec2868be..836c1ca4cf0 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdi.h,v 1.44 2013/04/08 10:34:20 mglocker Exp $ */
+/* $OpenBSD: usbdi.h,v 1.45 2013/04/09 08:47:56 mpi Exp $ */
/* $NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
@@ -128,9 +128,6 @@ usbd_status usbd_do_request_async(usbd_device_handle pipe,
usb_device_request_t *req, void *data);
usbd_status usbd_do_request_flags(usbd_device_handle pipe,
usb_device_request_t *req, void *data, u_int16_t flags, int*, u_int32_t);
-usbd_status usbd_do_request_flags_pipe( usbd_device_handle dev,
- usbd_pipe_handle pipe, usb_device_request_t *req, void *data,
- u_int16_t flags, int *actlen, u_int32_t);
usb_interface_descriptor_t *usbd_get_interface_descriptor(
usbd_interface_handle iface);
usb_config_descriptor_t *usbd_get_config_descriptor(usbd_device_handle dev);