From ccf624e80cb453f99b85073ab15d1c7bd469fc86 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 28 Feb 2012 12:57:22 +0100
Subject: [PATCH] --- yaml --- r: 289643 b: refs/heads/master c:
 427914801e553806ee6b25241603030ce376d43b h: refs/heads/master i:   289641:
 7f961386adb17b6cd59394c7857e1e3951e06b6b   289639:
 0137f136d67832a9acc8c9227bd5420387b159d2 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/usb/host/r8a66597-hcd.c | 21 ++++-----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 3f2f9e0bb174..5379a797e164 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e8d3fe4bf680b8263e0c81a8aa46a8d07b0f7be
+refs/heads/master: 427914801e553806ee6b25241603030ce376d43b
diff --git a/trunk/drivers/usb/host/r8a66597-hcd.c b/trunk/drivers/usb/host/r8a66597-hcd.c
index e84ca1928dbf..2bf1320dc9c3 100644
--- a/trunk/drivers/usb/host/r8a66597-hcd.c
+++ b/trunk/drivers/usb/host/r8a66597-hcd.c
@@ -2428,6 +2428,9 @@ static int __devinit r8a66597_probe(struct platform_device *pdev)
 	int i;
 	unsigned long irq_trigger;
 
+	if (usb_disabled())
+		return -ENODEV;
+
 	if (pdev->dev.dma_mask) {
 		ret = -EINVAL;
 		dev_err(&pdev->dev, "dma not supported\n");
@@ -2552,20 +2555,4 @@ static struct platform_driver r8a66597_driver = {
 	},
 };
 
-static int __init r8a66597_init(void)
-{
-	if (usb_disabled())
-		return -ENODEV;
-
-	printk(KERN_INFO KBUILD_MODNAME ": driver %s, %s\n", hcd_name,
-	       DRIVER_VERSION);
-	return platform_driver_register(&r8a66597_driver);
-}
-module_init(r8a66597_init);
-
-static void __exit r8a66597_cleanup(void)
-{
-	platform_driver_unregister(&r8a66597_driver);
-}
-module_exit(r8a66597_cleanup);
-
+module_platform_driver(r8a66597_driver);