usb: Parse the new USB 3.1 SuperSpeedPlus Isoc endpoint companion descriptor

[sfrench/cifs-2.6.git] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 89533ba38691a75ae70523d5f56bcf0b57a22c80..8fc881af87352798e96731002d3d8ef98591dd9b 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -50,6 +50,7 @@ struct ep_device;
  * struct usb_host_endpoint - host-side endpoint descriptor and queue
  * @desc: descriptor for this endpoint, wMaxPacketSize in native byteorder
  * @ss_ep_comp: SuperSpeed companion descriptor for this endpoint
+ * @ssp_isoc_ep_comp: SuperSpeedPlus isoc companion descriptor for this endpoint
  * @urb_list: urbs queued to this endpoint; maintained by usbcore
  * @hcpriv: for use by HCD; typically holds hardware dma queue head (QH)
  *     with one or more transfer descriptors (TDs) per urb
@@ -65,6 +66,7 @@ struct ep_device;
 struct usb_host_endpoint {
        struct usb_endpoint_descriptor          desc;
        struct usb_ss_ep_comp_descriptor        ss_ep_comp;
+       struct usb_ssp_isoc_ep_comp_descriptor  ssp_isoc_ep_comp;
        struct list_head                urb_list;
        void                            *hcpriv;
        struct ep_device                *ep_dev;        /* For sysfs info */
@@ -375,7 +377,6 @@ struct usb_bus {
        struct usb_devmap devmap;       /* device address allocation map */
        struct usb_device *root_hub;    /* Root hub */
        struct usb_bus *hs_companion;   /* Companion EHCI bus, if any */
-       struct list_head bus_list;      /* list of busses */
 
        struct mutex usb_address0_mutex; /* unaddressed device mutex */
 
@@ -642,9 +643,10 @@ extern struct usb_device *usb_hub_find_child(struct usb_device *hdev,
                if (!child) continue; else
 
 /* USB device locking */
-#define usb_lock_device(udev)          device_lock(&(udev)->dev)
-#define usb_unlock_device(udev)                device_unlock(&(udev)->dev)
-#define usb_trylock_device(udev)       device_trylock(&(udev)->dev)
+#define usb_lock_device(udev)                  device_lock(&(udev)->dev)
+#define usb_unlock_device(udev)                        device_unlock(&(udev)->dev)
+#define usb_lock_device_interruptible(udev)    device_lock_interruptible(&(udev)->dev)
+#define usb_trylock_device(udev)               device_trylock(&(udev)->dev)
 extern int usb_lock_device_for_reset(struct usb_device *udev,
                                     const struct usb_interface *iface);