summaryrefslogtreecommitdiff
path: root/drivers/usb/host/isp1362-hcd.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2012-02-17 19:30:04 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-25 01:12:16 +0400
commitaefd49206814413b5ade2f98ff062c4c8d47ec4f (patch)
treec9dce3d7fb4fc26eecc87540b571d54051aaa7e4 /drivers/usb/host/isp1362-hcd.c
parent18c75720e667719c923e0547abb60dfcd9c4ee90 (diff)
downloadlinux-aefd49206814413b5ade2f98ff062c4c8d47ec4f.tar.xz
usb: isp1362-hcd: Convert to module_platform_driver
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> Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/isp1362-hcd.c')
-rw-r--r--drivers/usb/host/isp1362-hcd.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index e5fd8aa57af1..9e63cdf1ab75 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -2693,6 +2693,9 @@ static int __devinit isp1362_probe(struct platform_device *pdev)
struct resource *irq_res;
unsigned int irq_flags = 0;
+ if (usb_disabled())
+ return -ENODEV;
+
/* basic sanity checks first. board-specific init logic should
* have initialized this the three resources and probably board
* specific platform_data. we don't probe for IRQs, and do only
@@ -2864,19 +2867,4 @@ static struct platform_driver isp1362_driver = {
},
};
-/*-------------------------------------------------------------------------*/
-
-static int __init isp1362_init(void)
-{
- if (usb_disabled())
- return -ENODEV;
- pr_info("driver %s, %s\n", hcd_name, DRIVER_VERSION);
- return platform_driver_register(&isp1362_driver);
-}
-module_init(isp1362_init);
-
-static void __exit isp1362_cleanup(void)
-{
- platform_driver_unregister(&isp1362_driver);
-}
-module_exit(isp1362_cleanup);
+module_platform_driver(isp1362_driver);