usb: gadget: convert all users to the new udc infrastructure

peripheral drivers are using usb_add_gadget()/usb_del_gadget() to
register/unregister to the udc-core.

The udc-core will take the first available gadget driver and attach
function driver which is calling usb_gadget_register_driver(). This is
the same behaviour we have right now.

Only dummy_hcd was tested, the others were compiled tested.

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Anton Tikhomirov <av.tikhomirov@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Dan Carpenter <error27@gmail.com>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Li Yang <leoli@freescale.com>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Pavankumar Kondeti <pkondeti@codeaurora.org>
Cc: Roy Huang <roy.huang@analog.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Cc: Xiaochen Shen <xiaochen.shen@intel.com>
Cc: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Cc: Yuan-Hsin Chen <yhchen@faraday-tech.com>
Cc: cxie4 <cxie4@marvell.com>
Cc: linux-geode@lists.infradead.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 21 insertions, 10 deletions

diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index d3dcabc1a5fc..d47a565d085c 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -710,11 +710,17 @@ static int dummy_pullup (struct usb_gadget *_gadget, int value)
         return 0;
 }
 
+static int dummy_udc_start(struct usb_gadget_driver *driver,
+                int (*bind)(struct usb_gadget *));
+static int dummy_udc_stop(struct usb_gadget_driver *driver);
+
 static const struct usb_gadget_ops dummy_ops = {
         .get_frame      = dummy_g_get_frame,
         .wakeup         = dummy_wakeup,
         .set_selfpowered = dummy_set_selfpowered,
         .pullup         = dummy_pullup,
+        .start          = dummy_udc_start,
+        .stop           = dummy_udc_stop,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -747,8 +753,7 @@ static DEVICE_ATTR (function, S_IRUGO, show_function, NULL);
  * for each driver that registers:  just add to a big root hub.
  */
 
-int
-usb_gadget_probe_driver(struct usb_gadget_driver *driver,
+static int dummy_udc_start(struct usb_gadget_driver *driver,
                 int (*bind)(struct usb_gadget *))
 {
         struct dummy    *dum = the_controller;
@@ -812,10 +817,8 @@ usb_gadget_probe_driver(struct usb_gadget_driver *driver,
         usb_hcd_poll_rh_status (dummy_to_hcd (dum));
         return 0;
 }
-EXPORT_SYMBOL(usb_gadget_probe_driver);
 
-int
-usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
+static int dummy_udc_stop(struct usb_gadget_driver *driver)
 {
         struct dummy    *dum = the_controller;
         unsigned long   flags;
@@ -845,7 +848,6 @@ usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
         usb_hcd_poll_rh_status (dummy_to_hcd (dum));
         return 0;
 }
-EXPORT_SYMBOL (usb_gadget_unregister_driver);
 
 #undef is_enabled
 
@@ -892,11 +894,20 @@ static int dummy_udc_probe (struct platform_device *pdev)
                 return rc;
         }
 
+        rc = usb_add_gadget_udc(&pdev->dev, &dum->gadget);
+        if (rc < 0)
+                goto err_udc;
+
         rc = device_create_file (&dum->gadget.dev, &dev_attr_function);
         if (rc < 0)
-                device_unregister (&dum->gadget.dev);
-        else
-                platform_set_drvdata(pdev, dum);
+                goto err_dev;
+        platform_set_drvdata(pdev, dum);
+        return rc;
+
+err_dev:
+        usb_del_gadget_udc(&dum->gadget);
+err_udc:
+        device_unregister(&dum->gadget.dev);
         return rc;
 }
 
@@ -904,6 +915,7 @@ static int dummy_udc_remove (struct platform_device *pdev)
 {
         struct dummy    *dum = platform_get_drvdata (pdev);
 
+        usb_del_gadget_udc(&dum->gadget);
         platform_set_drvdata (pdev, NULL);
         device_remove_file (&dum->gadget.dev, &dev_attr_function);
         device_unregister (&dum->gadget.dev);
@@ -1863,7 +1875,6 @@ static void dummy_stop (struct usb_hcd *hcd)
         dum = hcd_to_dummy (hcd);
 
         device_remove_file (dummy_dev(dum), &dev_attr_urbs);
-        usb_gadget_unregister_driver (dum->driver);
         dev_info (dummy_dev(dum), "stopped\n");
 }