---

yaml --- r: 364606 b: refs/heads/master c: ef222cb h: refs/heads/master v: v3
git-mirror · Mar 18, 2013 · 7eb4f65 · 7eb4f65
1 parent 1626484
commit 7eb4f65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 756380e04276c9099f41716d279d24e5847b1030
+refs/heads/master: ef222cb5b575df57d8cd511965800519b90a6c31
diff --git a/trunk/drivers/usb/gadget/pxa27x_udc.c b/trunk/drivers/usb/gadget/pxa27x_udc.c
@@ -2410,7 +2410,7 @@ static struct pxa_udc memory = {
  * Perform basic init : allocates udc clock, creates sysfs files, requests
  * irq.
  */
-static int __init pxa_udc_probe(struct platform_device *pdev)
+static int pxa_udc_probe(struct platform_device *pdev)
 {
 	struct resource *regs;
 	struct pxa_udc *udc = &memory;
@@ -2612,6 +2612,7 @@ static struct platform_driver udc_driver = {
 		.name	= "pxa27x-udc",
 		.owner	= THIS_MODULE,
 	},
+	.probe		= pxa_udc_probe,
 	.remove		= __exit_p(pxa_udc_remove),
 	.shutdown	= pxa_udc_shutdown,
 #ifdef CONFIG_PM
@@ -2620,17 +2621,7 @@ static struct platform_driver udc_driver = {
 #endif
 };
 
-static int __init udc_init(void)
-{
-	return platform_driver_probe(&udc_driver, pxa_udc_probe);
-}
-module_init(udc_init);
-
-static void __exit udc_exit(void)
-{
-	platform_driver_unregister(&udc_driver);
-}
-module_exit(udc_exit);
+module_platform_driver(udc_driver);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Robert Jarzmik");