usb: sl811-hcd: Convert to module_platform_driver
authorTobias Klauser <tklauser@distanz.ch>
Tue, 28 Feb 2012 11:57:23 +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/sl811-hcd.c

index 961d6638d8f9404e16eea2158eba7ae49d171776..2a2cce2d2fa706b6ab59a562295fb4e6ec7666a0 100644 (file)
@@ -1632,6 +1632,9 @@ sl811h_probe(struct platform_device *dev)
        u8                      tmp, ioaddr = 0;
        unsigned long           irqflags;
 
+       if (usb_disabled())
+               return -ENODEV;
+
        /* basic sanity checks first.  board-specific init logic should
         * have initialized these three resources and probably board
         * specific platform_data.  we don't probe for IRQs, and do only
@@ -1817,20 +1820,4 @@ struct platform_driver sl811h_driver = {
 };
 EXPORT_SYMBOL(sl811h_driver);
 
-/*-------------------------------------------------------------------------*/
-
-static int __init sl811h_init(void)
-{
-       if (usb_disabled())
-               return -ENODEV;
-
-       INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION);
-       return platform_driver_register(&sl811h_driver);
-}
-module_init(sl811h_init);
-
-static void __exit sl811h_cleanup(void)
-{
-       platform_driver_unregister(&sl811h_driver);
-}
-module_exit(sl811h_cleanup);
+module_platform_driver(sl811h_driver);