Skip to content

Commit

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

0 comments on commit 6ef1a92

Please sign in to comment.