diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/usb/composite.h | 15 | ||||
-rw-r--r-- | include/linux/usb/gadget.h | 6 |
2 files changed, 0 insertions, 21 deletions
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 2014d6b1babc..99830d63d8f1 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h | |||
@@ -148,21 +148,6 @@ int usb_interface_id(struct usb_configuration *, struct usb_function *); | |||
148 | int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f, | 148 | int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f, |
149 | struct usb_ep *_ep); | 149 | struct usb_ep *_ep); |
150 | 150 | ||
151 | /** | ||
152 | * ep_choose - select descriptor endpoint at current device speed | ||
153 | * @g: gadget, connected and running at some speed | ||
154 | * @hs: descriptor to use for high speed operation | ||
155 | * @fs: descriptor to use for full or low speed operation | ||
156 | */ | ||
157 | static inline struct usb_endpoint_descriptor * | ||
158 | ep_choose(struct usb_gadget *g, struct usb_endpoint_descriptor *hs, | ||
159 | struct usb_endpoint_descriptor *fs) | ||
160 | { | ||
161 | if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH) | ||
162 | return hs; | ||
163 | return fs; | ||
164 | } | ||
165 | |||
166 | #define MAX_CONFIG_INTERFACES 16 /* arbitrary; max 255 */ | 151 | #define MAX_CONFIG_INTERFACES 16 /* arbitrary; max 255 */ |
167 | 152 | ||
168 | /** | 153 | /** |
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 0bcc2b76bcd8..d22b4a4936cb 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h | |||
@@ -879,12 +879,6 @@ int usb_gadget_config_buf(const struct usb_config_descriptor *config, | |||
879 | struct usb_descriptor_header **usb_copy_descriptors( | 879 | struct usb_descriptor_header **usb_copy_descriptors( |
880 | struct usb_descriptor_header **); | 880 | struct usb_descriptor_header **); |
881 | 881 | ||
882 | /* return copy of endpoint descriptor given original descriptor set */ | ||
883 | struct usb_endpoint_descriptor *usb_find_endpoint( | ||
884 | struct usb_descriptor_header **src, | ||
885 | struct usb_descriptor_header **copy, | ||
886 | struct usb_endpoint_descriptor *match); | ||
887 | |||
888 | /** | 882 | /** |
889 | * usb_free_descriptors - free descriptors returned by usb_copy_descriptors() | 883 | * usb_free_descriptors - free descriptors returned by usb_copy_descriptors() |
890 | * @v: vector of descriptors | 884 | * @v: vector of descriptors |