usb: gadget: drop now unnecessary flag

We don't need the ->register_my_device flag
anymore because all UDC drivers have been
properly converted.

Let's remove every history of it.

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

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index e95e8bb..1b65ac8 100644 (file)
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1721,7 +1721,6 @@ static int udc_start(struct ci13xxx *ci)
        ci->gadget.dev.coherent_dma_mask = dev->coherent_dma_mask;
        ci->gadget.dev.parent   = dev;
        ci->gadget.dev.release  = udc_release;
-       ci->gadget.register_my_device = true;
 
        /* alloc resources */
        ci->qh_pool = dma_pool_create("ci13xxx_qh", dev,

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 10bb161..65493b6 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2499,7 +2499,6 @@ int dwc3_gadget_init(struct dwc3 *dwc)
        dwc->gadget.dev.dma_parms       = dwc->dev->dma_parms;
        dwc->gadget.dev.dma_mask        = dwc->dev->dma_mask;
        dwc->gadget.dev.release         = dwc3_gadget_release;
-       dwc->gadget.register_my_device  = true;
        dwc->gadget.name                = "dwc3-gadget";
 
        /*

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index eee01ea..eec4461 100644 (file)
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -3275,7 +3275,6 @@ static int udc_probe(struct udc *dev)
        dev->gadget.dev.release = gadget_release;
        dev->gadget.name = name;
        dev->gadget.max_speed = USB_SPEED_HIGH;
-       dev->gadget.register_my_device = true;
 
        /* init registers, interrupts, ... */
        startup_registers(dev);

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 47b7e58..9936de9 100644 (file)
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1726,7 +1726,6 @@ static int at91udc_probe(struct platform_device *pdev)
 
        /* init software state */
        udc = &controller;
-       udc->gadget.register_my_device = true;
        udc->gadget.dev.parent = dev;
        if (pdev->dev.of_node)
                at91udc_of_init(udc, pdev->dev.of_node);

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 2404d0c..41518e6 100644 (file)
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -1902,7 +1902,6 @@ static int __init usba_udc_probe(struct platform_device *pdev)
 
        udc->gadget.dev.parent = &pdev->dev;
        udc->gadget.dev.dma_mask = pdev->dev.dma_mask;
-       udc->gadget.register_my_device = true;
 
        platform_set_drvdata(pdev, udc);
 

diff --git a/drivers/usb/gadget/bcm63xx_udc.c b/drivers/usb/gadget/bcm63xx_udc.c
index c020b87..d4f73e1 100644 (file)
--- a/drivers/usb/gadget/bcm63xx_udc.c
+++ b/drivers/usb/gadget/bcm63xx_udc.c
@@ -2374,7 +2374,6 @@ static int bcm63xx_udc_probe(struct platform_device *pdev)
        udc->gadget.dev.parent = dev;
        udc->gadget.dev.release = bcm63xx_udc_gadget_release;
        udc->gadget.dev.dma_mask = dev->dma_mask;
-       udc->gadget.register_my_device = true;
 
        if (!pd->use_fullspeed && !use_fullspeed)
                udc->gadget.max_speed = USB_SPEED_HIGH;

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index a6950aa..c4f27d5 100644 (file)
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -983,7 +983,6 @@ static int dummy_udc_probe(struct platform_device *pdev)
        dum->gadget.name = gadget_name;
        dum->gadget.ops = &dummy_ops;
        dum->gadget.max_speed = USB_SPEED_SUPER;
-       dum->gadget.register_my_device = true;
 
        dum->gadget.dev.parent = &pdev->dev;
        dum->gadget.dev.release = dummy_gadget_release;

diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index 0f78cd8..0e7531b 100644 (file)
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -2525,7 +2525,6 @@ static int qe_udc_probe(struct platform_device *ofdev)
        udc->gadget.name = driver_name;
        udc->gadget.dev.release = qe_udc_release;
        udc->gadget.dev.parent = &ofdev->dev;
-       udc->gadget.register_my_device = true;
 
        /* initialize qe_ep struct */
        for (i = 0; i < USB_MAX_ENDPOINTS ; i++) {

diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 9140a2d..f33b900 100644 (file)
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -2524,7 +2524,6 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
        udc_controller->gadget.dev.release = fsl_udc_release;
        udc_controller->gadget.dev.parent = &pdev->dev;
        udc_controller->gadget.dev.of_node = pdev->dev.of_node;
-       udc_controller->gadget.register_my_device = true;
 
        if (!IS_ERR_OR_NULL(udc_controller->transceiver))
                udc_controller->gadget.is_otg = 1;

diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c
index d290172..2d3c8b3 100644 (file)
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/fusb300_udc.c
@@ -1427,7 +1427,6 @@ static int __init fusb300_probe(struct platform_device *pdev)
        fusb300->gadget.dev.dma_mask = pdev->dev.dma_mask;
        fusb300->gadget.dev.release = pdev->dev.release;
        fusb300->gadget.name = udc_name;
-       fusb300->gadget.register_my_device = true;
        fusb300->reg = reg;
 
        ret = request_irq(ires->start, fusb300_irq, IRQF_SHARED,

diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index b4ea2cf..8a6c666 100644 (file)
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1758,7 +1758,6 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
        dev->gadget.dev.release = gadget_release;
        dev->gadget.name = driver_name;
-       dev->gadget.register_my_device = true;
 
        /* now all the pci goodies ... */
        retval = pci_enable_device(pdev);

diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
index 435b203..9c5b745 100644 (file)
--- a/drivers/usb/gadget/imx_udc.c
+++ b/drivers/usb/gadget/imx_udc.c
@@ -1461,7 +1461,6 @@ static int __init imx_udc_probe(struct platform_device *pdev)
        imx_usb->clk = clk;
        imx_usb->dev = &pdev->dev;
 
-       imx_usb->gadget.register_my_device = true;
        imx_usb->gadget.dev.parent = &pdev->dev;
        imx_usb->gadget.dev.dma_mask = pdev->dev.dma_mask;
 

diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c
index 329e1c5..67c3ef9 100644 (file)
--- a/drivers/usb/gadget/lpc32xx_udc.c
+++ b/drivers/usb/gadget/lpc32xx_udc.c
@@ -3090,7 +3090,6 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
 
        /* init software state */
        udc->gadget.dev.parent = dev;
-       udc->gadget.register_my_device = true;
        udc->pdev = pdev;
        udc->dev = &pdev->dev;
        udc->enabled = 0;

diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 43ad70d..eb61d0b 100644 (file)
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1612,7 +1612,6 @@ static int __init m66592_probe(struct platform_device *pdev)
        m66592->gadget.dev.dma_mask = pdev->dev.dma_mask;
        m66592->gadget.dev.release = pdev->dev.release;
        m66592->gadget.name = udc_name;
-       m66592->gadget.register_my_device = true;
 
        init_timer(&m66592->timer);
        m66592->timer.function = m66592_timer;

diff --git a/drivers/usb/gadget/mv_u3d_core.c b/drivers/usb/gadget/mv_u3d_core.c
index 734ade1..e5735fc 100644 (file)
--- a/drivers/usb/gadget/mv_u3d_core.c
+++ b/drivers/usb/gadget/mv_u3d_core.c
@@ -1959,7 +1959,6 @@ static int mv_u3d_probe(struct platform_device *dev)
        u3d->gadget.dev.dma_mask = dev->dev.dma_mask;
        u3d->gadget.dev.release = mv_u3d_gadget_release;
        u3d->gadget.name = driver_name;         /* gadget name */
-       u3d->gadget.register_my_device = true;
 
        mv_u3d_eps_init(u3d);
 

diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index a7afdfb..be35573 100644 (file)
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -2313,7 +2313,6 @@ static int mv_udc_probe(struct platform_device *pdev)
        udc->gadget.dev.dma_mask = pdev->dev.dma_mask;
        udc->gadget.dev.release = gadget_release;
        udc->gadget.name = driver_name;         /* gadget name */
-       udc->gadget.register_my_device = true;
 
        eps_init(udc);
 

diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c
index 635248f..78c8bb5 100644 (file)
--- a/drivers/usb/gadget/net2272.c
+++ b/drivers/usb/gadget/net2272.c
@@ -2239,7 +2239,6 @@ static struct net2272 *net2272_probe_init(struct device *dev, unsigned int irq)
        ret->gadget.dev.dma_mask = dev->dma_mask;
        ret->gadget.dev.release = net2272_gadget_release;
        ret->gadget.name = driver_name;
-       ret->gadget.register_my_device = true;
 
        return ret;
 }

diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index c55af42..2089d9b 100644 (file)
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2714,7 +2714,6 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
        dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
        dev->gadget.dev.release = gadget_release;
        dev->gadget.name = driver_name;
-       dev->gadget.register_my_device = true;
 
        /* now all the pci goodies ... */
        if (pci_enable_device (pdev) < 0) {

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index c979272..b23c861 100644 (file)
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2634,7 +2634,6 @@ omap_udc_setup(struct platform_device *odev, struct usb_phy *xceiv)
 
        udc->gadget.dev.release = omap_udc_release;
        udc->gadget.dev.parent = &odev->dev;
-       udc->gadget.register_my_device = true;
        if (use_dma)
                udc->gadget.dev.dma_mask = odev->dev.dma_mask;
 

diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 7032145..e8c9afd 100644 (file)
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -3198,7 +3198,6 @@ static int pch_udc_probe(struct pci_dev *pdev,
        dev->gadget.dev.release = gadget_release;
        dev->gadget.name = KBUILD_MODNAME;
        dev->gadget.max_speed = USB_SPEED_HIGH;
-       dev->gadget.register_my_device = true;
 
        /* Put the device in disconnected state till a driver is bound */
        pch_udc_set_disconnect(dev);

diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 8996fcb..e29bb87 100644 (file)
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -2140,7 +2140,6 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
 
        dev->gadget.dev.parent = &pdev->dev;
        dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
-       dev->gadget.register_my_device = true;
 
        the_controller = dev;
        platform_set_drvdata(pdev, dev);

diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 1c5bfaa..07ce147 100644 (file)
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -2457,7 +2457,6 @@ static int __init pxa_udc_probe(struct platform_device *pdev)
 
        udc->gadget.dev.parent = &pdev->dev;
        udc->gadget.dev.dma_mask = NULL;
-       udc->gadget.register_my_device = true;
        udc->vbus_sensed = 0;
 
        the_controller = udc;

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index ae94c0e..a67d477 100644 (file)
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1919,7 +1919,6 @@ static int __init r8a66597_probe(struct platform_device *pdev)
        r8a66597->gadget.dev.dma_mask = pdev->dev.dma_mask;
        r8a66597->gadget.dev.release = pdev->dev.release;
        r8a66597->gadget.name = udc_name;
-       r8a66597->gadget.register_my_device = true;
 
        init_timer(&r8a66597->timer);
        r8a66597->timer.function = r8a66597_timer;

diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 5fbd233..8ae0bd9 100644 (file)
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -3573,7 +3573,6 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
        hsotg->gadget.dev.parent = dev;
        hsotg->gadget.dev.dma_mask = dev->dma_mask;
        hsotg->gadget.dev.release = s3c_hsotg_release;
-       hsotg->gadget.register_my_device = true;
 
        /* reset the system */
 

diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index c4ff747..7fc3de5 100644 (file)
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -1312,7 +1312,6 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
        hsudc->gadget.is_otg = 0;
        hsudc->gadget.is_a_peripheral = 0;
        hsudc->gadget.speed = USB_SPEED_UNKNOWN;
-       hsudc->gadget.register_my_device = true;
 
        s3c_hsudc_setup_ep(hsudc);
 

diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index c413494..a669081 100644 (file)
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1826,7 +1826,6 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
 
        udc->gadget.dev.parent = &pdev->dev;
        udc->gadget.dev.dma_mask = pdev->dev.dma_mask;
-       udc->gadget.register_my_device = true;
 
        the_controller = udc;
        platform_set_drvdata(pdev, udc);

diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index 9195054..40b1d88 100644 (file)
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -173,13 +173,11 @@ int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget)
        if (!udc)
                goto err1;
 
-       if (gadget->register_my_device) {
-               dev_set_name(&gadget->dev, "gadget");
+       dev_set_name(&gadget->dev, "gadget");
 
-               ret = device_register(&gadget->dev);
-               if (ret)
-                       goto err2;
-       }
+       ret = device_register(&gadget->dev);
+       if (ret)
+               goto err2;
 
        device_initialize(&udc->dev);
        udc->dev.release = usb_udc_release;
@@ -211,8 +209,8 @@ err3:
        put_device(&udc->dev);
 
 err2:
-       if (gadget->register_my_device)
-               put_device(&gadget->dev);
+       put_device(&gadget->dev);
+
 err1:
        return ret;
 }
@@ -266,9 +264,7 @@ found:
 
        kobject_uevent(&udc->dev.kobj, KOBJ_REMOVE);
        device_unregister(&udc->dev);
-
-       if (gadget->register_my_device)
-               device_unregister(&gadget->dev);
+       device_unregister(&gadget->dev);
 }
 EXPORT_SYMBOL_GPL(usb_del_gadget_udc);
 

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index cadb750..e363033 100644 (file)
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1891,7 +1891,6 @@ int musb_gadget_setup(struct musb *musb)
        musb->g.dev.dma_mask = musb->controller->dma_mask;
        musb->g.dev.release = musb_gadget_release;
        musb->g.name = musb_driver_name;
-       musb->g.register_my_device = true;
        musb->g.is_otg = 1;
 
        musb_g_init_endpoints(musb);

diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 5d5fab0..6a3afa9 100644 (file)
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -981,7 +981,6 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
        gpriv->gadget.name              = "renesas_usbhs_udc";
        gpriv->gadget.ops               = &usbhsg_gadget_ops;
        gpriv->gadget.max_speed         = USB_SPEED_HIGH;
-       gpriv->gadget.register_my_device = true;
 
        INIT_LIST_HEAD(&gpriv->gadget.ep_list);
 

diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index fcd9ef8..2e297e8 100644 (file)
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -494,9 +494,6 @@ struct usb_gadget_ops {
  *     only supports HNP on a different root port.
  * @b_hnp_enable: OTG device feature flag, indicating that the A-Host
  *     enabled HNP support.
- * @register_my_device: Flag telling udc-core that UDC driver didn't
- *     register the gadget device to the driver model. Temporary until
- *     all UDC drivers are fixed up properly.
  * @name: Identifies the controller hardware type.  Used in diagnostics
  *     and sometimes configuration.
  * @dev: Driver model state for this abstract device.
@@ -534,7 +531,6 @@ struct usb_gadget {
        unsigned                        b_hnp_enable:1;
        unsigned                        a_hnp_support:1;
        unsigned                        a_alt_hnp_support:1;
-       unsigned                        register_my_device:1;
        const char                      *name;
        struct device                   dev;
        unsigned                        out_epnum;