From d0748c933b61ba836b9d9fe9fcb113f1e53ed339 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 17 Feb 2012 16:30:04 +0100 Subject: [PATCH] --- yaml --- r: 289465 b: refs/heads/master c: aefd49206814413b5ade2f98ff062c4c8d47ec4f h: refs/heads/master i: 289463: 72cd4cec1bc331dd18bbc3908cfb706af5370592 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/isp1362-hcd.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 309a50e7a8c3..4ef7054a6c0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18c75720e667719c923e0547abb60dfcd9c4ee90 +refs/heads/master: aefd49206814413b5ade2f98ff062c4c8d47ec4f diff --git a/trunk/drivers/usb/host/isp1362-hcd.c b/trunk/drivers/usb/host/isp1362-hcd.c index e5fd8aa57af1..9e63cdf1ab75 100644 --- a/trunk/drivers/usb/host/isp1362-hcd.c +++ b/trunk/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);