usb: gadget: s3c2410_udc: fix unterminated platform_device_id table

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / usb / gadget / s3c2410_udc.c

diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index 100f2635cf0a1d2ee3ef0a175c685e6f35a2b213..8d31848aab091534ae998e588f7803c88ea121c9 100644 (file)
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1552,6 +1552,10 @@ static int s3c2410_vbus_draw(struct usb_gadget *_gadget, unsigned ma)
        return -ENOTSUPP;
 }
 
+static int s3c2410_udc_start(struct usb_gadget_driver *driver,
+               int (*bind)(struct usb_gadget *));
+static int s3c2410_udc_stop(struct usb_gadget_driver *driver);
+
 static const struct usb_gadget_ops s3c2410_ops = {
        .get_frame              = s3c2410_udc_get_frame,
        .wakeup                 = s3c2410_udc_wakeup,
@@ -1559,6 +1563,8 @@ static const struct usb_gadget_ops s3c2410_ops = {
        .pullup                 = s3c2410_udc_pullup,
        .vbus_session           = s3c2410_udc_vbus_session,
        .vbus_draw              = s3c2410_vbus_draw,
+       .start                  = s3c2410_udc_start,
+       .stop                   = s3c2410_udc_stop,
 };
 
 static void s3c2410_udc_command(enum s3c2410_udc_cmd_e cmd)
@@ -1567,7 +1573,7 @@ static void s3c2410_udc_command(enum s3c2410_udc_cmd_e cmd)
                return;
 
        if (udc_info->udc_command) {
-               udc_info->udc_command(S3C2410_UDC_P_DISABLE);
+               udc_info->udc_command(cmd);
        } else if (gpio_is_valid(udc_info->pullup_pin)) {
                int value;
 
@@ -1672,10 +1678,7 @@ static void s3c2410_udc_enable(struct s3c2410_udc *dev)
        s3c2410_udc_command(S3C2410_UDC_P_ENABLE);
 }
 
-/*
- *     usb_gadget_probe_driver
- */
-int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
+static int s3c2410_udc_start(struct usb_gadget_driver *driver,
                int (*bind)(struct usb_gadget *))
 {
        struct s3c2410_udc *udc = the_controller;
@@ -1730,12 +1733,8 @@ register_error:
        udc->gadget.dev.driver = NULL;
        return retval;
 }
-EXPORT_SYMBOL(usb_gadget_probe_driver);
 
-/*
- *     usb_gadget_unregister_driver
- */
-int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
+static int s3c2410_udc_stop(struct usb_gadget_driver *driver)
 {
        struct s3c2410_udc *udc = the_controller;
 
@@ -1955,6 +1954,10 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
                        goto err_vbus_irq;
        }
 
+       retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget);
+       if (retval)
+               goto err_add_udc;
+
        if (s3c2410_udc_debugfs_root) {
                udc->regs_info = debugfs_create_file("registers", S_IRUGO,
                                s3c2410_udc_debugfs_root,
@@ -1967,6 +1970,10 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
 
        return 0;
 
+err_add_udc:
+       if (udc_info && !udc_info->udc_command &&
+                       gpio_is_valid(udc_info->pullup_pin))
+               gpio_free(udc_info->pullup_pin);
 err_vbus_irq:
        if (udc_info && udc_info->vbus_pin > 0)
                free_irq(gpio_to_irq(udc_info->vbus_pin), udc);
@@ -1992,6 +1999,8 @@ static int s3c2410_udc_remove(struct platform_device *pdev)
        unsigned int irq;
 
        dev_dbg(&pdev->dev, "%s()\n", __func__);
+
+       usb_del_gadget_udc(&udc->gadget);
        if (udc->driver)
                return -EBUSY;
 
@@ -2048,26 +2057,23 @@ static int s3c2410_udc_resume(struct platform_device *pdev)
 #define s3c2410_udc_resume     NULL
 #endif
 
-static struct platform_driver udc_driver_2410 = {
-       .driver         = {
-               .name   = "s3c2410-usbgadget",
-               .owner  = THIS_MODULE,
-       },
-       .probe          = s3c2410_udc_probe,
-       .remove         = s3c2410_udc_remove,
-       .suspend        = s3c2410_udc_suspend,
-       .resume         = s3c2410_udc_resume,
+static const struct platform_device_id s3c_udc_ids[] = {
+       { "s3c2410-usbgadget", },
+       { "s3c2440-usbgadget", },
+       { }
 };
+MODULE_DEVICE_TABLE(platform, s3c_udc_ids);
 
-static struct platform_driver udc_driver_2440 = {
+static struct platform_driver udc_driver_24x0 = {
        .driver         = {
-               .name   = "s3c2440-usbgadget",
+               .name   = "s3c24x0-usbgadget",
                .owner  = THIS_MODULE,
        },
        .probe          = s3c2410_udc_probe,
        .remove         = s3c2410_udc_remove,
        .suspend        = s3c2410_udc_suspend,
        .resume         = s3c2410_udc_resume,
+       .id_table       = s3c_udc_ids,
 };
 
 static int __init udc_init(void)
@@ -2083,11 +2089,7 @@ static int __init udc_init(void)
                s3c2410_udc_debugfs_root = NULL;
        }
 
-       retval = platform_driver_register(&udc_driver_2410);
-       if (retval)
-               goto err;
-
-       retval = platform_driver_register(&udc_driver_2440);
+       retval = platform_driver_register(&udc_driver_24x0);
        if (retval)
                goto err;
 
@@ -2100,13 +2102,10 @@ err:
 
 static void __exit udc_exit(void)
 {
-       platform_driver_unregister(&udc_driver_2410);
-       platform_driver_unregister(&udc_driver_2440);
+       platform_driver_unregister(&udc_driver_24x0);
        debugfs_remove(s3c2410_udc_debugfs_root);
 }
 
-EXPORT_SYMBOL(usb_gadget_unregister_driver);
-
 module_init(udc_init);
 module_exit(udc_exit);
 
@@ -2114,5 +2113,3 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:s3c2410-usbgadget");
-MODULE_ALIAS("platform:s3c2440-usbgadget");