diff options
author | Ajay Kumar Gupta <ajay.gupta@ti.com> | 2012-08-31 11:09:50 +0000 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-09-11 17:34:45 +0300 |
commit | 8d2421e68cb8a159963641eab72f8f8ba1c7f7b0 (patch) | |
tree | f8214a8ca20d8487c1e304ab56b6a528960cb0df /drivers/usb/musb/musb_debugfs.c | |
parent | 65b3d52d02a558fbfe08e43688e15390c5ab3067 (diff) | |
download | linux-8d2421e68cb8a159963641eab72f8f8ba1c7f7b0.tar.gz linux-8d2421e68cb8a159963641eab72f8f8ba1c7f7b0.tar.bz2 linux-8d2421e68cb8a159963641eab72f8f8ba1c7f7b0.zip |
usb: musb: kill global and static for multi instance
Moved global variable "musb_debugfs_root" and static variable
"old_state" to 'struct musb' to help support multi instance of
musb controller as present on AM335x platform.
Also removed the global variable "orig_dma_mask" and filled the
dev->dma_mask with parent device's dma_mask.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Santhapuri, Damodar <damodar.santhapuri@ti.com>
Signed-off-by: Ravi Babu <ravibabu@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/musb_debugfs.c')
-rw-r--r-- | drivers/usb/musb/musb_debugfs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c index 40a37c91cc10..1d6e8af94c06 100644 --- a/drivers/usb/musb/musb_debugfs.c +++ b/drivers/usb/musb/musb_debugfs.c @@ -103,8 +103,6 @@ static const struct musb_register_map musb_regmap[] = { { } /* Terminating Entry */ }; -static struct dentry *musb_debugfs_root; - static int musb_regdump_show(struct seq_file *s, void *unused) { struct musb *musb = s->private; @@ -241,7 +239,7 @@ int __devinit musb_init_debugfs(struct musb *musb) struct dentry *file; int ret; - root = debugfs_create_dir("musb", NULL); + root = debugfs_create_dir(dev_name(musb->controller), NULL); if (!root) { ret = -ENOMEM; goto err0; @@ -261,7 +259,7 @@ int __devinit musb_init_debugfs(struct musb *musb) goto err1; } - musb_debugfs_root = root; + musb->debugfs_root = root; return 0; @@ -274,5 +272,5 @@ err0: void /* __init_or_exit */ musb_exit_debugfs(struct musb *musb) { - debugfs_remove_recursive(musb_debugfs_root); + debugfs_remove_recursive(musb->debugfs_root); } |