usb: gadget: rename usb_gadget_driver::speed to max_speed

This commit renames the “speed” field of the usb_gadget_driver
structure to “max_speed”.  This is so that to make it more
apparent that the field represents the maximum speed gadget
driver can support.

This also make the field look more like fields with the same
name in usb_gadget and usb_composite_driver structures.  All
of those represent the *maximal* speed given entity supports.

After this commit, there are the following fields in various
structures:
* usb_gadget::speed - the current connection speed,
* usb_gadget::max_speed - maximal speed UDC supports,
* usb_gadget_driver::max_speed - maximal speed gadget driver
  supports, and
* usb_composite_driver::max_speed - maximal speed composite
  gadget supports.

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

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index e69cdbca80175c9e319a01d564659220ec2e4b69..e9a2c5c44454f18eb89a1608dccaee0136ba9f1a 100644 (file)
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -1959,7 +1959,7 @@ static int amd5536_start(struct usb_gadget_driver *driver,
        u32 tmp;
 
        if (!driver || !bind || !driver->setup
-                       || driver->speed < USB_SPEED_HIGH)
+                       || driver->max_speed < USB_SPEED_HIGH)
                return -EINVAL;
        if (!dev)
                return -ENODEV;

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 8efe0fa9228dc737f1623fd18cf8e4411208f67b..ac41f71bf9ca3372f1af86f20f112b0db0b4bce2 100644 (file)
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1633,7 +1633,7 @@ static int at91_start(struct usb_gadget_driver *driver,
        unsigned long   flags;
 
        if (!driver
-                       || driver->speed < USB_SPEED_FULL
+                       || driver->max_speed < USB_SPEED_FULL
                        || !bind
                        || !driver->setup) {
                DBG("bad parameter.\n");

diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 9767d9170fbd687f9526084d5f254427a19221e1..27e313718422a5c2f1726330ab822d1fa9f133c8 100644 (file)
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -813,7 +813,7 @@ static ssize_t show_driver(struct device *dev, struct device_attribute *attr,
        n += scnprintf(buf + n, PAGE_SIZE - n, "function  = %s\n",
                       (driver->function ? driver->function : ""));
        n += scnprintf(buf + n, PAGE_SIZE - n, "max speed = %d\n",
-                      driver->speed);
+                      driver->max_speed);
 
        return n;
 }

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index f71b0787983f29469222e3e83631d17636c400ce..a95de6a4a13447d3217d7495bcd94079bca04903 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1535,9 +1535,9 @@ composite_resume(struct usb_gadget *gadget)
 
 static struct usb_gadget_driver composite_driver = {
 #ifdef CONFIG_USB_GADGET_SUPERSPEED
-       .speed          = USB_SPEED_SUPER,
+       .max_speed      = USB_SPEED_SUPER,
 #else
-       .speed          = USB_SPEED_HIGH,
+       .max_speed      = USB_SPEED_HIGH,
 #endif
 
        .unbind         = composite_unbind,
@@ -1584,8 +1584,8 @@ int usb_composite_probe(struct usb_composite_driver *driver,
                driver->iProduct = driver->name;
        composite_driver.function =  (char *) driver->name;
        composite_driver.driver.name = driver->name;
-       composite_driver.speed = min((u8)composite_driver.speed,
-                                    (u8)driver->max_speed);
+       composite_driver.max_speed =
+               min_t(u8, composite_driver.max_speed, driver->max_speed);
        composite = driver;
        composite_gadget_bind = bind;
 

diff --git a/drivers/usb/gadget/dbgp.c b/drivers/usb/gadget/dbgp.c
index 6256420089f3a4bca25bd649fab2e3dab0b0515f..19d7bb0df75a3515e0347ad6d03cda57c1c6e301 100644 (file)
--- a/drivers/usb/gadget/dbgp.c
+++ b/drivers/usb/gadget/dbgp.c
@@ -404,7 +404,7 @@ fail:
 
 static struct usb_gadget_driver dbgp_driver = {
        .function = "dbgp",
-       .speed = USB_SPEED_HIGH,
+       .max_speed = USB_SPEED_HIGH,
        .unbind = dbgp_unbind,
        .setup = dbgp_setup,
        .disconnect = dbgp_disconnect,

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index cf235d84d8b700c2bdd2990d2167619ae0e73eaa..db815c2da7ed42743a907b793ed8556d1864d728 100644 (file)
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -823,19 +823,18 @@ static int dummy_pullup (struct usb_gadget *_gadget, int value)
 
        if (value && dum->driver) {
                if (mod_data.is_super_speed)
-                       dum->gadget.speed = dum->driver->speed;
+                       dum->gadget.speed = dum->driver->max_speed;
                else if (mod_data.is_high_speed)
                        dum->gadget.speed = min_t(u8, USB_SPEED_HIGH,
-                                       dum->driver->speed);
+                                       dum->driver->max_speed);
                else
                        dum->gadget.speed = USB_SPEED_FULL;
                dummy_udc_udpate_ep0(dum);
 
-               if (dum->gadget.speed < dum->driver->speed)
+               if (dum->gadget.speed < dum->driver->max_speed)
                        dev_dbg(udc_dev(dum), "This device can perform faster"
-                                       " if you connect it to a %s port...\n",
-                                       (dum->driver->speed == USB_SPEED_SUPER ?
-                                        "SuperSpeed" : "HighSpeed"));
+                               " if you connect it to a %s port...\n",
+                               usb_speed_string(dum->driver->max_speed));
        }
        dum_hcd = gadget_to_dummy_hcd(_gadget);
 
@@ -898,7 +897,7 @@ static int dummy_udc_start(struct usb_gadget *g,
        struct dummy_hcd        *dum_hcd = gadget_to_dummy_hcd(g);
        struct dummy            *dum = dum_hcd->dum;
 
-       if (driver->speed == USB_SPEED_UNKNOWN)
+       if (driver->max_speed == USB_SPEED_UNKNOWN)
                return -EINVAL;
 
        /*

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index e8ff2f1c06ccf73e4fb6da1cc11192c595abfcc7..e0f30fc70e45b8e787f46b86fd91e75415052fe6 100644 (file)
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -3604,7 +3604,7 @@ static void fsg_resume(struct usb_gadget *gadget)
 /*-------------------------------------------------------------------------*/
 
 static struct usb_gadget_driver                fsg_driver = {
-       .speed          = USB_SPEED_SUPER,
+       .max_speed      = USB_SPEED_SUPER,
        .function       = (char *) fsg_string_product,
        .unbind         = fsg_unbind,
        .disconnect     = fsg_disconnect,

diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index e00cf92409ce5114f061801c3d3e29b6b6bae23e..b7a1efef938dfc43f39aee0fc334f80f09006f35 100644 (file)
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -2336,7 +2336,7 @@ static int fsl_qe_start(struct usb_gadget_driver *driver,
        if (!udc_controller)
                return -ENODEV;
 
-       if (!driver || driver->speed < USB_SPEED_FULL
+       if (!driver || driver->max_speed < USB_SPEED_FULL
                        || !bind || !driver->disconnect || !driver->setup)
                return -EINVAL;
 
@@ -2350,7 +2350,7 @@ static int fsl_qe_start(struct usb_gadget_driver *driver,
        /* hook up the driver */
        udc_controller->driver = driver;
        udc_controller->gadget.dev.driver = &driver->driver;
-       udc_controller->gadget.speed = (enum usb_device_speed)(driver->speed);
+       udc_controller->gadget.speed = driver->max_speed;
        spin_unlock_irqrestore(&udc_controller->lock, flags);
 
        retval = bind(&udc_controller->gadget);

diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 6de8ec75381808829fcec0fff54fcac58939d8a8..d7ea6c076ce98e185ee43b557c524d2b29c67270 100644 (file)
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1934,7 +1934,7 @@ static int fsl_start(struct usb_gadget_driver *driver,
        if (!udc_controller)
                return -ENODEV;
 
-       if (!driver || driver->speed < USB_SPEED_FULL
+       if (!driver || driver->max_speed < USB_SPEED_FULL
                        || !bind || !driver->disconnect || !driver->setup)
                return -EINVAL;
 

diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c
index 6e32a60ab3b7f2ef681dc5b8e5279c70d35e325c..5831cb4a0b35733dd6cf7202722eee1764c0aa82 100644 (file)
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/fusb300_udc.c
@@ -1317,7 +1317,7 @@ static int fusb300_udc_start(struct usb_gadget_driver *driver,
        int retval;
 
        if (!driver
-                       || driver->speed < USB_SPEED_FULL
+                       || driver->max_speed < USB_SPEED_FULL
                        || !bind
                        || !driver->setup)
                return -EINVAL;

diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index ab9c924eee763516ac6c44f68d3da721e24a13bb..5af70fcce139ba675ec9d0b2739183317cb92936 100644 (file)
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1357,7 +1357,7 @@ static int goku_start(struct usb_gadget_driver *driver,
        int                     retval;
 
        if (!driver
-                       || driver->speed < USB_SPEED_FULL
+                       || driver->max_speed < USB_SPEED_FULL
                        || !bind
                        || !driver->disconnect
                        || !driver->setup)

diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
index 2d978c0e7ced73b391a9eed1d7bcb2d9c4f16481..8d1c75abd73d109f52f8fec7030aac86951fdb23 100644 (file)
--- a/drivers/usb/gadget/imx_udc.c
+++ b/drivers/usb/gadget/imx_udc.c
@@ -1336,7 +1336,7 @@ static int imx_udc_start(struct usb_gadget_driver *driver,
        int retval;
 
        if (!driver
-               || driver->speed < USB_SPEED_FULL
+               || driver->max_speed < USB_SPEED_FULL
                || !bind
                || !driver->disconnect
                || !driver->setup)

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 6ccae2707e596c3f24d5705495264f0dcfa4f31b..93612519b53afa17bcda5c08593c1caeebf78074 100644 (file)
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1766,9 +1766,9 @@ gadgetfs_suspend (struct usb_gadget *gadget)
 
 static struct usb_gadget_driver gadgetfs_driver = {
 #ifdef CONFIG_USB_GADGET_DUALSPEED
-       .speed          = USB_SPEED_HIGH,
+       .max_speed      = USB_SPEED_HIGH,
 #else
-       .speed          = USB_SPEED_FULL,
+       .max_speed      = USB_SPEED_FULL,
 #endif
        .function       = (char *) driver_desc,
        .unbind         = gadgetfs_unbind,
@@ -1792,7 +1792,7 @@ static int gadgetfs_probe (struct usb_gadget *gadget)
 }
 
 static struct usb_gadget_driver probe_driver = {
-       .speed          = USB_SPEED_HIGH,
+       .max_speed      = USB_SPEED_HIGH,
        .unbind         = gadgetfs_nop,
        .setup          = (void *)gadgetfs_nop,
        .disconnect     = gadgetfs_nop,

diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index a7692c208ea755c11a7c8e7c4c3de9696a972cd2..3608b3bd57328fca524e6431229d166451992cf4 100644 (file)
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1472,7 +1472,7 @@ static int m66592_start(struct usb_gadget_driver *driver,
        int retval;
 
        if (!driver
-                       || driver->speed < USB_SPEED_HIGH
+                       || driver->max_speed < USB_SPEED_HIGH
                        || !bind
                        || !driver->setup)
                return -EINVAL;

diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c
index d5050f4e84493310b9e89d4166c1060ee0f92499..4c81d540bc2696529a2c4a090ab0ed86037fbecd 100644 (file)
--- a/drivers/usb/gadget/net2272.c
+++ b/drivers/usb/gadget/net2272.c
@@ -1459,7 +1459,7 @@ static int net2272_start(struct usb_gadget *_gadget,
        unsigned i;
 
        if (!driver || !driver->unbind || !driver->setup ||
-           driver->speed != USB_SPEED_HIGH)
+           driver->max_speed != USB_SPEED_HIGH)
                return -EINVAL;
 
        dev = container_of(_gadget, struct net2272, gadget);

diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 9ee36fd5adae0be3ca2907ed1e0d6c3604948377..cf1f36454d0860fee87933281bb1e5cfaed168b2 100644 (file)
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -1881,7 +1881,7 @@ static int net2280_start(struct usb_gadget *_gadget,
         * (dev->usb->xcvrdiag & FORCE_FULL_SPEED_MODE)
         * "must not be used in normal operation"
         */
-       if (!driver || driver->speed < USB_SPEED_HIGH
+       if (!driver || driver->max_speed < USB_SPEED_HIGH
                        || !driver->setup)
                return -EINVAL;
 

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index ed01a0f5f119d4fc3997f08b314de998c0eacc62..7db5bbe6251b2f02422af9dc48225ede0714b881 100644 (file)
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2110,7 +2110,7 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
                return -ENODEV;
        if (!driver
                        // FIXME if otg, check:  driver->is_otg
-                       || driver->speed < USB_SPEED_FULL
+                       || driver->max_speed < USB_SPEED_FULL
                        || !bind || !driver->setup)
                return -EINVAL;
 

diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 7f97b4adba3e5f782700e3925a40a1ffd1b51a2e..dd2313cce1d35b8d5db8d67903db41202f7fff71 100644 (file)
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -2693,7 +2693,7 @@ static int pch_udc_start(struct usb_gadget_driver *driver,
        struct pch_udc_dev      *dev = pch_udc;
        int                     retval;
 
-       if (!driver || (driver->speed == USB_SPEED_UNKNOWN) || !bind ||
+       if (!driver || (driver->max_speed == USB_SPEED_UNKNOWN) || !bind ||
            !driver->setup || !driver->unbind || !driver->disconnect) {
                dev_err(&dev->pdev->dev,
                        "%s: invalid driver parameter\n", __func__);

diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index b74f49ac95e5a647298aa2a30ae0bba7f3260603..d83134b0f78a03ff7ed2c429be95735fb88da68f 100644 (file)
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -1535,7 +1535,7 @@ fail:
 /*-------------------------------------------------------------------------*/
 
 static struct usb_gadget_driver printer_driver = {
-       .speed          = DEVSPEED,
+       .max_speed      = DEVSPEED,
 
        .function       = (char *) driver_desc,
        .unbind         = printer_unbind,

diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index c090a7e3ecf886a2c3c525c935cf5dd608c697ea..dd470635f4f783a160fb2547716ac169c50f6318 100644 (file)
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -1264,7 +1264,7 @@ static int pxa25x_start(struct usb_gadget_driver *driver,
        int                     retval;
 
        if (!driver
-                       || driver->speed < USB_SPEED_FULL
+                       || driver->max_speed < USB_SPEED_FULL
                        || !bind
                        || !driver->disconnect
                        || !driver->setup)

diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 18b6b091f2a6bb4eda9ae83de05fbde5586c4c22..f4c44eb806c3bbc7c518d755c9f34f028382a651 100644 (file)
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1807,7 +1807,7 @@ static int pxa27x_udc_start(struct usb_gadget_driver *driver,
        struct pxa_udc *udc = the_controller;
        int retval;
 
-       if (!driver || driver->speed < USB_SPEED_FULL || !bind
+       if (!driver || driver->max_speed < USB_SPEED_FULL || !bind
                        || !driver->disconnect || !driver->setup)
                return -EINVAL;
        if (!udc)

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index 3666d7c54e24101223dcf2d229d9adfecc7049da..f5b8d215e1d582bb4cc740ad71f4161555069b0f 100644 (file)
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1746,7 +1746,7 @@ static int r8a66597_start(struct usb_gadget *gadget,
        struct r8a66597 *r8a66597 = gadget_to_r8a66597(gadget);
 
        if (!driver
-                       || driver->speed < USB_SPEED_HIGH
+                       || driver->max_speed < USB_SPEED_HIGH
                        || !driver->setup)
                return -EINVAL;
        if (!r8a66597)

diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 6bc7ad87c306fc974ad984d0447544e32a0cf0ee..d098c36cb587d00fbe11c3ee2f61467b6cb52ebb 100644 (file)
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -2586,7 +2586,7 @@ static int s3c_hsotg_start(struct usb_gadget_driver *driver,
                return -EINVAL;
        }
 
-       if (driver->speed < USB_SPEED_FULL)
+       if (driver->max_speed < USB_SPEED_FULL)
                dev_err(hsotg->dev, "%s: bad speed\n", __func__);
 
        if (!bind || !driver->setup) {

diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 09ea96558b913c6ce51345c59a77740e1f8f8903..f398b8590f9cafd16c8ef86e8702d96d33f9df0c 100644 (file)
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -1142,7 +1142,7 @@ static int s3c_hsudc_start(struct usb_gadget_driver *driver,
        int ret;
 
        if (!driver
-               || driver->speed < USB_SPEED_FULL
+               || driver->max_speed < USB_SPEED_FULL
                || !bind
                || !driver->unbind || !driver->disconnect || !driver->setup)
                return -EINVAL;

diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index b8643771fa80eb6a27c4eac0c481659970bcb245..4d860e9460a4084de091991f32abd1911c71ddeb 100644 (file)
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1683,9 +1683,9 @@ static int s3c2410_udc_start(struct usb_gadget_driver *driver,
        if (udc->driver)
                return -EBUSY;
 
-       if (!bind || !driver->setup || driver->speed < USB_SPEED_FULL) {
+       if (!bind || !driver->setup || driver->max_speed < USB_SPEED_FULL) {
                printk(KERN_ERR "Invalid driver: bind %p setup %p speed %d\n",
-                       bind, driver->setup, driver->speed);
+                       bind, driver->setup, driver->max_speed);
                return -EINVAL;
        }
 #if defined(MODULE)

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 47a3d1e5b28b60fe170ddf7c10260d26d09b24d7..3148461287b1b04512f51d7f24907fec3f369cdb 100644 (file)
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1903,7 +1903,7 @@ static int musb_gadget_start(struct usb_gadget *g,
        unsigned long           flags;
        int                     retval = -EINVAL;
 
-       if (driver->speed < USB_SPEED_HIGH)
+       if (driver->max_speed < USB_SPEED_HIGH)
                goto err0;
 
        pm_runtime_get_sync(musb->controller);

diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 43c67e5cde2600a41647e41fba4f022df9fff35a..c307c8f5bd3a058a2bbdc614761c6758925674e6 100644 (file)
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -751,7 +751,7 @@ static int usbhsg_gadget_start(struct usb_gadget *gadget,
 
        if (!driver             ||
            !driver->setup      ||
-           driver->speed < USB_SPEED_FULL)
+           driver->max_speed < USB_SPEED_FULL)
                return -EINVAL;
 
        /* first hook up the driver ... */

diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 98dc306898b51d98ef6e107783bb72476f32cb53..317d8925387c2efa1f2319f99d0bbf094d68f508 100644 (file)
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -760,7 +760,7 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
 /**
  * struct usb_gadget_driver - driver for usb 'slave' devices
  * @function: String describing the gadget's function
- * @speed: Highest speed the driver handles.
+ * @max_speed: Highest speed the driver handles.
  * @setup: Invoked for ep0 control requests that aren't handled by
  *     the hardware level driver. Most calls must be handled by
  *     the gadget driver, including descriptor and configuration
@@ -824,7 +824,7 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
  */
 struct usb_gadget_driver {
        char                    *function;
-       enum usb_device_speed   speed;
+       enum usb_device_speed   max_speed;
        void                    (*unbind)(struct usb_gadget *);
        int                     (*setup)(struct usb_gadget *,
                                        const struct usb_ctrlrequest *);