diff options
| -rw-r--r-- | drivers/usb/gadget/composite.c | 5 | ||||
| -rw-r--r-- | include/linux/usb/composite.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 7c821de8ce3d..c0d62b278610 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c | |||
| @@ -1757,10 +1757,7 @@ static const struct usb_gadget_driver composite_driver_template = { | |||
| 1757 | /** | 1757 | /** |
| 1758 | * usb_composite_probe() - register a composite driver | 1758 | * usb_composite_probe() - register a composite driver |
| 1759 | * @driver: the driver to register | 1759 | * @driver: the driver to register |
| 1760 | * @bind: the callback used to allocate resources that are shared across the | 1760 | * |
| 1761 | * whole device, such as string IDs, and add its configurations using | ||
| 1762 | * @usb_add_config(). This may fail by returning a negative errno | ||
| 1763 | * value; it should return zero on successful initialization. | ||
| 1764 | * Context: single threaded during gadget setup | 1761 | * Context: single threaded during gadget setup |
| 1765 | * | 1762 | * |
| 1766 | * This function is used to register drivers using the composite driver | 1763 | * This function is used to register drivers using the composite driver |
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 3c671c1b37f6..8860594d6364 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h | |||
| @@ -60,7 +60,7 @@ struct usb_configuration; | |||
| 60 | * @name: For diagnostics, identifies the function. | 60 | * @name: For diagnostics, identifies the function. |
| 61 | * @strings: tables of strings, keyed by identifiers assigned during bind() | 61 | * @strings: tables of strings, keyed by identifiers assigned during bind() |
| 62 | * and by language IDs provided in control requests | 62 | * and by language IDs provided in control requests |
| 63 | * @descriptors: Table of full (or low) speed descriptors, using interface and | 63 | * @fs_descriptors: Table of full (or low) speed descriptors, using interface and |
| 64 | * string identifiers assigned during @bind(). If this pointer is null, | 64 | * string identifiers assigned during @bind(). If this pointer is null, |
| 65 | * the function will not be available at full speed (or at low speed). | 65 | * the function will not be available at full speed (or at low speed). |
| 66 | * @hs_descriptors: Table of high speed descriptors, using interface and | 66 | * @hs_descriptors: Table of high speed descriptors, using interface and |
| @@ -290,6 +290,7 @@ enum { | |||
| 290 | * after function notifications | 290 | * after function notifications |
| 291 | * @resume: Notifies configuration when the host restarts USB traffic, | 291 | * @resume: Notifies configuration when the host restarts USB traffic, |
| 292 | * before function notifications | 292 | * before function notifications |
| 293 | * @gadget_driver: Gadget driver controlling this driver | ||
| 293 | * | 294 | * |
| 294 | * Devices default to reporting self powered operation. Devices which rely | 295 | * Devices default to reporting self powered operation. Devices which rely |
| 295 | * on bus powered operation should report this in their @bind method. | 296 | * on bus powered operation should report this in their @bind method. |
