Skip to content

Commit

Permalink
usb: isp116x-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 b1116dc commit 2e8d3fe
Showing 1 changed file with 4 additions and 19 deletions.
23 changes: 4 additions & 19 deletions drivers/usb/host/isp116x-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1569,6 +1569,9 @@ static int __devinit isp116x_probe(struct platform_device *pdev)
int ret = 0;
unsigned long irqflags;

if (usb_disabled())
return -ENODEV;

if (pdev->num_resources < 3) {
ret = -ENODEV;
goto err1;
Expand Down Expand Up @@ -1708,22 +1711,4 @@ static struct platform_driver isp116x_driver = {
},
};

/*-----------------------------------------------------------------*/

static int __init isp116x_init(void)
{
if (usb_disabled())
return -ENODEV;

INFO("driver %s, %s\n", hcd_name, DRIVER_VERSION);
return platform_driver_register(&isp116x_driver);
}

module_init(isp116x_init);

static void __exit isp116x_cleanup(void)
{
platform_driver_unregister(&isp116x_driver);
}

module_exit(isp116x_cleanup);
module_platform_driver(isp116x_driver);

0 comments on commit 2e8d3fe

Please sign in to comment.