Skip to content

Commit

Permalink
usb: isp1362-hcd: Convert to module_platform_driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tobias Klauser authored and Greg Kroah-Hartman committed Feb 24, 2012
1 parent 18c7572 commit aefd492
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions drivers/usb/host/isp1362-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);

0 comments on commit aefd492

Please sign in to comment.