diff options
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index f89c24a03bd9..7ee1b5c3b4cb 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -82,7 +82,7 @@ struct usb_host_interface { | |||
| 82 | int extralen; | 82 | int extralen; |
| 83 | unsigned char *extra; /* Extra descriptors */ | 83 | unsigned char *extra; /* Extra descriptors */ |
| 84 | 84 | ||
| 85 | /* array of desc.bNumEndpoint endpoints associated with this | 85 | /* array of desc.bNumEndpoints endpoints associated with this |
| 86 | * interface setting. these will be in no particular order. | 86 | * interface setting. these will be in no particular order. |
| 87 | */ | 87 | */ |
| 88 | struct usb_host_endpoint *endpoint; | 88 | struct usb_host_endpoint *endpoint; |
| @@ -127,10 +127,6 @@ enum usb_interface_condition { | |||
| 127 | * to the sysfs representation for that device. | 127 | * to the sysfs representation for that device. |
| 128 | * @pm_usage_cnt: PM usage counter for this interface | 128 | * @pm_usage_cnt: PM usage counter for this interface |
| 129 | * @reset_ws: Used for scheduling resets from atomic context. | 129 | * @reset_ws: Used for scheduling resets from atomic context. |
| 130 | * @reset_running: set to 1 if the interface is currently running a | ||
| 131 | * queued reset so that usb_cancel_queued_reset() doesn't try to | ||
| 132 | * remove from the workqueue when running inside the worker | ||
| 133 | * thread. See __usb_queue_reset_device(). | ||
| 134 | * @resetting_device: USB core reset the device, so use alt setting 0 as | 130 | * @resetting_device: USB core reset the device, so use alt setting 0 as |
| 135 | * current; needs bandwidth alloc after reset. | 131 | * current; needs bandwidth alloc after reset. |
| 136 | * | 132 | * |
| @@ -181,7 +177,6 @@ struct usb_interface { | |||
| 181 | unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */ | 177 | unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */ |
| 182 | unsigned needs_altsetting0:1; /* switch to altsetting 0 is pending */ | 178 | unsigned needs_altsetting0:1; /* switch to altsetting 0 is pending */ |
| 183 | unsigned needs_binding:1; /* needs delayed unbind/rebind */ | 179 | unsigned needs_binding:1; /* needs delayed unbind/rebind */ |
| 184 | unsigned reset_running:1; | ||
| 185 | unsigned resetting_device:1; /* true: bandwidth alloc after reset */ | 180 | unsigned resetting_device:1; /* true: bandwidth alloc after reset */ |
| 186 | 181 | ||
| 187 | struct device dev; /* interface specific device info */ | 182 | struct device dev; /* interface specific device info */ |
