summaryrefslogtreecommitdiff
path: root/drivers/usb/musb/blackfin.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2012-01-26 12:40:23 +0200
committerFelipe Balbi <balbi@ti.com>2012-01-31 14:18:26 +0200
commite9e8c85e69310141d78daaecd6a56138700ac317 (patch)
treeb778093675b5e115fc3289385ea323225fe66887 /drivers/usb/musb/blackfin.c
parentf557978745bbea2e7305588d33aac60f4dd42447 (diff)
downloadlinux-3.10-e9e8c85e69310141d78daaecd6a56138700ac317.tar.gz
linux-3.10-e9e8c85e69310141d78daaecd6a56138700ac317.tar.bz2
linux-3.10-e9e8c85e69310141d78daaecd6a56138700ac317.zip
usb: musb: make modules behave better
There's really no point in doing all that initcall trickery when we can safely let udev handle module probing for us. Remove all of that trickery, by moving everybody to module_init() and making proper use of platform_device_register() rather than platform_device_probe(). Tested-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com> Tested-by: Tasslehoff Kjappfot <tasskjapp@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/blackfin.c')
-rw-r--r--drivers/usb/musb/blackfin.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 5e7cfba5b07..261af3487b5 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -463,7 +463,7 @@ static const struct musb_platform_ops bfin_ops = {
static u64 bfin_dmamask = DMA_BIT_MASK(32);
-static int __init bfin_probe(struct platform_device *pdev)
+static int __devinit bfin_probe(struct platform_device *pdev)
{
struct musb_hdrc_platform_data *pdata = pdev->dev.platform_data;
struct platform_device *musb;
@@ -525,7 +525,7 @@ err0:
return ret;
}
-static int __exit bfin_remove(struct platform_device *pdev)
+static int __devexit bfin_remove(struct platform_device *pdev)
{
struct bfin_glue *glue = platform_get_drvdata(pdev);
@@ -575,6 +575,7 @@ static struct dev_pm_ops bfin_pm_ops = {
#endif
static struct platform_driver bfin_driver = {
+ .probe = bfin_probe,
.remove = __exit_p(bfin_remove),
.driver = {
.name = "musb-blackfin",
@@ -588,9 +589,9 @@ MODULE_LICENSE("GPL v2");
static int __init bfin_init(void)
{
- return platform_driver_probe(&bfin_driver, bfin_probe);
+ return platform_driver_register(&bfin_driver);
}
-subsys_initcall(bfin_init);
+module_init(bfin_init);
static void __exit bfin_exit(void)
{