summaryrefslogtreecommitdiff
path: root/sys/dev/usb/usb_subr.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2012-01-08 13:12:39 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2012-01-08 13:12:39 +0000
commitacf5638afcdc79d36ae3fa055e57c9e0fdd15fb4 (patch)
tree849f3d70d7b87baea4a1c421a0a78b33713b6045 /sys/dev/usb/usb_subr.c
parent86f176c96d5dafb2e0858a6a2cd283b4bc336f69 (diff)
Remove usb_event_cookie_t type and instances of it found in various structs;
leftover from the "usb event" stuff removal. Diff from Tobias Ulmer.
Diffstat (limited to 'sys/dev/usb/usb_subr.c')
-rw-r--r--sys/dev/usb/usb_subr.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index a0f3154eb3a..067617f1d58 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_subr.c,v 1.80 2011/01/25 20:03:36 jakemsr Exp $ */
+/* $OpenBSD: usb_subr.c,v 1.81 2012/01/08 13:12:38 miod Exp $ */
/* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -73,8 +73,6 @@ void usbd_kill_pipe(usbd_pipe_handle);
usbd_status usbd_probe_and_attach(struct device *,
usbd_device_handle, int, int);
-u_int32_t usb_cookie_no = 0;
-
#ifdef USBVERBOSE
#include <dev/usb/usbdevs_data.h>
#endif /* USBVERBOSE */
@@ -1098,7 +1096,6 @@ usbd_new_device(struct device *parent, usbd_bus_handle bus, int depth,
}
dev->speed = speed;
dev->langid = USBD_NOLANG;
- dev->cookie.cookie = ++usb_cookie_no;
/* Establish the default pipe. */
err = usbd_setup_pipe(dev, 0, &dev->def_ep, USBD_DEFAULT_INTERVAL,
@@ -1361,7 +1358,6 @@ usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di,
di->udi_bus = dev->bus->bdev.dv_unit;
di->udi_addr = dev->address;
- di->udi_cookie = dev->cookie;
usbd_devinfo_vp(dev, di->udi_vendor, sizeof(di->udi_vendor),
di->udi_product, sizeof(di->udi_product), usedev);
usbd_printBCD(di->udi_release, sizeof di->udi_release,