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>

3 files changed, 14 insertions, 20 deletions

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 61b64fced256..bb56a0e8b23b 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -100,6 +100,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/idr.h>
+#include <linux/dma-mapping.h>
 
 #include "musb_core.h"
 
@@ -1797,10 +1798,9 @@ static const struct attribute_group musb_attr_group = {
 static void musb_irq_work(struct work_struct *data)
 {
         struct musb *musb = container_of(data, struct musb, irq_work);
-        static int old_state;
 
-        if (musb->xceiv->state != old_state) {
-                old_state = musb->xceiv->state;
+        if (musb->xceiv->state != musb->xceiv_old_state) {
+                musb->xceiv_old_state = musb->xceiv->state;
                 sysfs_notify(&musb->controller->kobj, NULL, "mode");
         }
 }
@@ -2060,11 +2060,6 @@ fail0:
 /* all implementations (PCI bridge to FPGA, VLYNQ, etc) should just
  * bridge to a platform device; this driver then suffices.
  */
-
-#ifndef CONFIG_MUSB_PIO_ONLY
-static u64      *orig_dma_mask;
-#endif
-
 static int __devinit musb_probe(struct platform_device *pdev)
 {
         struct device   *dev = &pdev->dev;
@@ -2083,10 +2078,6 @@ static int __devinit musb_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-#ifndef CONFIG_MUSB_PIO_ONLY
-        /* clobbered by use_dma=n */
-        orig_dma_mask = dev->dma_mask;
-#endif
         status = musb_init_controller(dev, irq, base);
         if (status < 0)
                 iounmap(base);
@@ -2096,7 +2087,8 @@ static int __devinit musb_probe(struct platform_device *pdev)
 
 static int __devexit musb_remove(struct platform_device *pdev)
 {
-        struct musb     *musb = dev_to_musb(&pdev->dev);
+        struct device   *dev = &pdev->dev;
+        struct musb     *musb = dev_to_musb(dev);
         void __iomem    *ctrl_base = musb->ctrl_base;
 
         /* this gets called on rmmod.
@@ -2109,9 +2101,9 @@ static int __devexit musb_remove(struct platform_device *pdev)
 
         musb_free(musb);
         iounmap(ctrl_base);
-        device_init_wakeup(&pdev->dev, 0);
+        device_init_wakeup(dev, 0);
 #ifndef CONFIG_MUSB_PIO_ONLY
-        pdev->dev.dma_mask = orig_dma_mask;
+        dma_set_mask(dev, *dev->parent->dma_mask);
 #endif
         return 0;
 }
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index a69ffd68a9e0..c158aacd6de8 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -437,6 +437,10 @@ struct musb {
 #ifdef MUSB_CONFIG_PROC_FS
         struct proc_dir_entry *proc_entry;
 #endif
+        int                     xceiv_old_state;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry           *debugfs_root;
+#endif
 };
 
 static inline struct musb *gadget_to_musb(struct usb_gadget *g)
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);
 }