Skip to content

Commit

Permalink
usb: r8a66597-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 2e8d3fe commit 4279148
Showing 1 changed file with 4 additions and 17 deletions.
21 changes: 4 additions & 17 deletions drivers/usb/host/r8a66597-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -2428,6 +2428,9 @@ static int __devinit r8a66597_probe(struct platform_device *pdev)
int i;
unsigned long irq_trigger;

if (usb_disabled())
return -ENODEV;

if (pdev->dev.dma_mask) {
ret = -EINVAL;
dev_err(&pdev->dev, "dma not supported\n");
Expand Down Expand Up @@ -2552,20 +2555,4 @@ static struct platform_driver r8a66597_driver = {
},
};

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

printk(KERN_INFO KBUILD_MODNAME ": driver %s, %s\n", hcd_name,
DRIVER_VERSION);
return platform_driver_register(&r8a66597_driver);
}
module_init(r8a66597_init);

static void __exit r8a66597_cleanup(void)
{
platform_driver_unregister(&r8a66597_driver);
}
module_exit(r8a66597_cleanup);

module_platform_driver(r8a66597_driver);

0 comments on commit 4279148

Please sign in to comment.