diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/uticom.c | 7 | ||||
| -rw-r--r-- | sys/dev/usb/uts.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/uvscom.c | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/sys/dev/usb/uticom.c b/sys/dev/usb/uticom.c index a0067c39ea3..010c85a0844 100644 --- a/sys/dev/usb/uticom.c +++ b/sys/dev/usb/uticom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uticom.c,v 1.32 2017/04/08 02:57:25 deraadt Exp $ */ +/* $OpenBSD: uticom.c,v 1.33 2018/03/15 00:42:41 kevlo Exp $ */ /* * Copyright (c) 2005 Dmitry Komissaroff <dxi@mail.ru>. * @@ -120,8 +120,6 @@ struct uticom_softc { struct usbd_device *sc_udev; /* device */ struct usbd_interface *sc_iface; /* interface */ - int sc_iface_number; /* interface number */ - struct usbd_interface *sc_intr_iface; /* interrupt interface */ int sc_intr_number; /* interrupt number */ struct usbd_pipe *sc_intr_pipe; /* interrupt pipe */ @@ -271,7 +269,6 @@ uticom_attach_hook(struct device *self) /* Find the bulk out interface used to upload firmware. */ id = usbd_get_interface_descriptor(sc->sc_iface); - sc->sc_iface_number = id->bInterfaceNumber; for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); @@ -351,7 +348,6 @@ fwload_done: /* Find the interrupt endpoints. */ id = usbd_get_interface_descriptor(sc->sc_iface); - sc->sc_iface_number = id->bInterfaceNumber; for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); @@ -382,7 +378,6 @@ fwload_done: /* Find the bulk{in,out} endpoints. */ id = usbd_get_interface_descriptor(sc->sc_iface); - sc->sc_iface_number = id->bInterfaceNumber; for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c index 480cc50bdaa..beaf74104d0 100644 --- a/sys/dev/usb/uts.c +++ b/sys/dev/usb/uts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uts.c,v 1.40 2017/04/08 02:57:25 deraadt Exp $ */ +/* $OpenBSD: uts.c,v 1.41 2018/03/15 00:42:41 kevlo Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -57,7 +57,6 @@ struct uts_softc { struct device sc_dev; struct usbd_device *sc_udev; struct usbd_interface *sc_iface; - int sc_iface_number; int sc_product; int sc_vendor; @@ -180,7 +179,6 @@ uts_attach(struct device *parent, struct device *self, void *aux) /* Find the interrupt endpoint */ id = usbd_get_interface_descriptor(sc->sc_iface); - sc->sc_iface_number = id->bInterfaceNumber; for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index 071a7db5774..423e4e1f235 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvscom.c,v 1.35 2017/04/08 02:57:25 deraadt Exp $ */ +/* $OpenBSD: uvscom.c,v 1.36 2018/03/15 00:42:41 kevlo Exp $ */ /* $NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. @@ -130,7 +130,6 @@ struct uvscom_softc { struct device sc_dev; /* base device */ struct usbd_device *sc_udev; /* USB device */ struct usbd_interface *sc_iface; /* interface */ - int sc_iface_number;/* interface number */ struct usbd_interface *sc_intr_iface; /* interrupt interface */ int sc_intr_number; /* interrupt number */ @@ -269,7 +268,6 @@ uvscom_attach(struct device *parent, struct device *self, void *aux) } id = usbd_get_interface_descriptor(sc->sc_iface); - sc->sc_iface_number = id->bInterfaceNumber; /* Find endpoints */ for (i = 0; i < id->bNumEndpoints; i++) { |