diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb.h | 7 | ||||
| -rw-r--r-- | include/linux/usb_gadget.h | 6 | ||||
| -rw-r--r-- | include/linux/usb_otg.h | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index e190f94e81e7..a43c95a016d7 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -651,8 +651,6 @@ typedef void (*usb_complete_t)(struct urb *, struct pt_regs *); * it likes with the URB, including resubmitting or freeing it. * @iso_frame_desc: Used to provide arrays of ISO transfer buffers and to * collect the transfer status for each buffer. - * @timeout: If set to zero, the urb will never timeout. Otherwise this is - * the time in jiffies that this urb will timeout in. * * This structure identifies USB transfer requests. URBs must be allocated by * calling usb_alloc_urb() and freed with a call to usb_free_urb(). @@ -682,8 +680,8 @@ typedef void (*usb_complete_t)(struct urb *, struct pt_regs *); * * Initialization: * - * All URBs submitted must initialize dev, pipe, - * transfer_flags (may be zero), complete, timeout (may be zero). + * All URBs submitted must initialize the dev, pipe, transfer_flags (may be + * zero), and complete fields. * The URB_ASYNC_UNLINK transfer flag affects later invocations of * the usb_unlink_urb() routine. Note: Failure to set URB_ASYNC_UNLINK * with usb_unlink_urb() is deprecated. For synchronous unlinks use @@ -783,7 +781,6 @@ struct urb int number_of_packets; /* (in) number of ISO packets */ int interval; /* (modify) transfer interval (INT/ISO) */ int error_count; /* (return) number of ISO errors */ - int timeout; /* (in) timeout, in jiffies */ void *context; /* (in) context for completion */ usb_complete_t complete; /* (in) completion routine */ struct usb_iso_packet_descriptor iso_frame_desc[0]; /* (in) ISO ONLY */ diff --git a/include/linux/usb_gadget.h b/include/linux/usb_gadget.h index 3f0831107a6c..9bba9997947b 100644 --- a/include/linux/usb_gadget.h +++ b/include/linux/usb_gadget.h @@ -767,12 +767,6 @@ usb_gadget_disconnect (struct usb_gadget *gadget) * the (remote) host can't do that any longer; or an error state might * be cleared, to make the device behave identically whether or not * power is maintained. - * - * If the OTG b_hnp_enabled flag is set during a suspend() call, the - * device may use HNP to switch from "B-Peripheral" to "B-Host" mode - * (or back from "A-Peripheral" mode to the original "A-Host") if - * the gadget driver calls usb_gadget_disconnect() before the device - * is resumed. */ struct usb_gadget_driver { char *function; diff --git a/include/linux/usb_otg.h b/include/linux/usb_otg.h index e7005b8f18bf..c6683146e9b0 100644 --- a/include/linux/usb_otg.h +++ b/include/linux/usb_otg.h @@ -114,3 +114,5 @@ otg_start_srp(struct otg_transceiver *otg) } +/* for OTG controller drivers (and maybe other stuff) */ +extern int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num); |