usb: gadget: get rid of USB_GADGET_{DUAL,SUPER}SPEED

This commit removes USB_GADGET_DUALSPEED and USB_GADGET_SUPERSPEED
Kconfig options.  Since now kernel allows many UDC drivers to be
compiled, those options may turn to no longer be valid.  For
instance, if someone decides to build UDC that supports super
speed and UDC that supports high speed only, the latter will be
"assumed" to support super speed since USB_GADGET_SUPERSPEED will
be selected by the former.

The test of whether CONFIG_USB_GADGET_*SPEED was defined was just
an optimisation which removed otherwise dead code (ie. if UDC is
not dual speed, there is no need to handle cases that can happen
if speed is high).  This commit removes those checks.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index e58b16442971..ae13a106fb96 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -828,7 +828,6 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
                 if (value == 0)
                         data->state = STATE_EP_ENABLED;
                 break;
-#ifdef  CONFIG_USB_GADGET_DUALSPEED
         case USB_SPEED_HIGH:
                 /* fails if caller didn't provide that descriptor... */
                 ep->desc = &data->hs_desc;
@@ -836,7 +835,6 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
                 if (value == 0)
                         data->state = STATE_EP_ENABLED;
                 break;
-#endif
         default:
                 DBG(data->dev, "unconnected, %s init abandoned\n",
                                 data->name);
@@ -1324,7 +1322,6 @@ static const struct file_operations ep0_io_operations = {
  * Unrecognized ep0 requests may be handled in user space.
  */
 
-#ifdef  CONFIG_USB_GADGET_DUALSPEED
 static void make_qualifier (struct dev_data *dev)
 {
         struct usb_qualifier_descriptor         qual;
@@ -1347,7 +1344,6 @@ static void make_qualifier (struct dev_data *dev)
 
         memcpy (dev->rbuf, &qual, sizeof qual);
 }
-#endif
 
 static int
 config_buf (struct dev_data *dev, u8 type, unsigned index)
@@ -1427,7 +1423,6 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                         dev->dev->bMaxPacketSize0 = dev->gadget->ep0->maxpacket;
                         req->buf = dev->dev;
                         break;
-#ifdef  CONFIG_USB_GADGET_DUALSPEED
                 case USB_DT_DEVICE_QUALIFIER:
                         if (!dev->hs_config)
                                 break;
@@ -1437,7 +1432,6 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                         break;
                 case USB_DT_OTHER_SPEED_CONFIG:
                         // FALLTHROUGH
-#endif
                 case USB_DT_CONFIG:
                         value = config_buf (dev,
                                         w_value >> 8,
@@ -1763,11 +1757,6 @@ gadgetfs_suspend (struct usb_gadget *gadget)
 }
 
 static struct usb_gadget_driver gadgetfs_driver = {
-#ifdef  CONFIG_USB_GADGET_DUALSPEED
-        .max_speed      = USB_SPEED_HIGH,
-#else
-        .max_speed      = USB_SPEED_FULL,
-#endif
         .function       = (char *) driver_desc,
         .unbind         = gadgetfs_unbind,
         .setup          = gadgetfs_setup,
@@ -1900,6 +1889,10 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
 
         /* triggers gadgetfs_bind(); then we can enumerate. */
         spin_unlock_irq (&dev->lock);
+        if (dev->hs_config)
+                gadgetfs_driver.max_speed = USB_SPEED_HIGH;
+        else
+                gadgetfs_driver.max_speed = USB_SPEED_FULL;
         value = usb_gadget_probe_driver(&gadgetfs_driver, gadgetfs_bind);
         if (value != 0) {
                 kfree (dev->buf);