1 files changed, 12 insertions, 21 deletions

diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 9517466ababb..5b6e50888248 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -474,7 +474,8 @@ struct usb_gadget_ops {
 
         /* Those two are deprecated */
         int     (*start)(struct usb_gadget_driver *,
-                        int (*bind)(struct usb_gadget *));
+                        int (*bind)(struct usb_gadget *,
+                                struct usb_gadget_driver *driver));
         int     (*stop)(struct usb_gadget_driver *);
 };
 
@@ -502,6 +503,8 @@ struct usb_gadget_ops {
  * @name: Identifies the controller hardware type.  Used in diagnostics
  *      and sometimes configuration.
  * @dev: Driver model state for this abstract device.
+ * @out_epnum: last used out ep number
+ * @in_epnum: last used in ep number
  *
  * Gadgets have a mostly-portable "gadget driver" implementing device
  * functions, handling all usb configurations and interfaces.  Gadget
@@ -536,6 +539,8 @@ struct usb_gadget {
         unsigned                        a_alt_hnp_support:1;
         const char                      *name;
         struct device                   dev;
+        unsigned                        out_epnum;
+        unsigned                        in_epnum;
 };
 
 static inline void set_gadget_data(struct usb_gadget *gadget, void *data)
@@ -558,14 +563,7 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
  */
 static inline int gadget_is_dualspeed(struct usb_gadget *g)
 {
-#ifdef CONFIG_USB_GADGET_DUALSPEED
-        /* runtime test would check "g->max_speed" ... that might be
-         * useful to work around hardware bugs, but is mostly pointless
-         */
-        return 1;
-#else
-        return 0;
-#endif
+        return g->max_speed >= USB_SPEED_HIGH;
 }
 
 /**
@@ -575,15 +573,7 @@ static inline int gadget_is_dualspeed(struct usb_gadget *g)
  */
 static inline int gadget_is_superspeed(struct usb_gadget *g)
 {
-#ifdef CONFIG_USB_GADGET_SUPERSPEED
-        /*
-         * runtime test would check "g->max_speed" ... that might be
-         * useful to work around hardware bugs, but is mostly pointless
-         */
-        return 1;
-#else
-        return 0;
-#endif
+        return g->max_speed >= USB_SPEED_SUPER;
 }
 
 /**
@@ -781,6 +771,7 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
  *      when the host is disconnected.  May be called in_interrupt; this
  *      may not sleep.  Some devices can't detect disconnect, so this might
  *      not be called except as part of controller shutdown.
+ * @bind: the driver's bind callback
  * @unbind: Invoked when the driver is unbound from a gadget,
  *      usually from rmmod (after a disconnect is reported).
  *      Called in a context that permits sleeping.
@@ -835,6 +826,8 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
 struct usb_gadget_driver {
         char                    *function;
         enum usb_device_speed   max_speed;
+        int                     (*bind)(struct usb_gadget *gadget,
+                                        struct usb_gadget_driver *driver);
         void                    (*unbind)(struct usb_gadget *);
         int                     (*setup)(struct usb_gadget *,
                                         const struct usb_ctrlrequest *);
@@ -860,7 +853,6 @@ struct usb_gadget_driver {
 /**
  * usb_gadget_probe_driver - probe a gadget driver
  * @driver: the driver being registered
- * @bind: the driver's bind callback
  * Context: can sleep
  *
  * Call this in your gadget driver's module initialization function,
@@ -869,8 +861,7 @@ struct usb_gadget_driver {
  * registration call returns.  It's expected that the @bind() function will
  * be in init sections.
  */
-int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *));
+int usb_gadget_probe_driver(struct usb_gadget_driver *driver);
 
 /**
  * usb_gadget_unregister_driver - unregister a gadget driver