usb: r8a66597-hcd: Convert to module_platform_driver
authorTobias Klauser <tklauser@distanz.ch>
Tue, 28 Feb 2012 11:57:22 +0000 (12:57 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Mar 2012 00:20:29 +0000 (16:20 -0800)
Use the module_platform_driver macro, move the usb_disabled() check to
the probe function and get rid of the rather pointless message on module
load.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/r8a66597-hcd.c

index e84ca19..2bf1320 100644 (file)
@@ -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);