UPSTREAM: usb: dwc3: make dwc3_debugfs_init return value be void

Debugfs init failure is not so important. We can continue our job on
this failure. Also no break need for debugfs_create_file call failure.

Signed-off-by: Du, Changbin <changbin.du@intel.com>
[felipe.balbi@linux.intel.com :
	- remove out-of-memory message, we get that from OOM.
	- switch dev_err() to dev_dbg() ]

Change-Id: I73e5345b64c20e327d0b941e256c518e5c2b195e
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
(cherry picked from commit 4e9f311833a946e984c82086b21b128918f4a6a4)

Conflicts:
	drivers/usb/dwc3/debugfs.c

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index e04077f4c9decfb7df71135bd4d4f3a874260c20..7d6b90cfe64c5463de480c3ab12f95c88dc8bb99 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1022,19 +1022,11 @@ static int dwc3_probe(struct platform_device *pdev)
        if (ret)
                goto err5;
 
-       ret = dwc3_debugfs_init(dwc);
-       if (ret) {
-               dev_err(dev, "failed to initialize debugfs\n");
-               goto err6;
-       }
-
+       dwc3_debugfs_init(dwc);
        pm_runtime_allow(dev);
 
        return 0;
 
-err6:
-       dwc3_core_exit_mode(dwc);
-
 err5:
        dwc3_event_buffers_cleanup(dwc);
 

diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h
index 07fbc2d94fd4f9961b7ae1b8c2cb60c9456fae9a..71e318025964ede1f2e48c910f9da630e5574886 100644 (file)
--- a/drivers/usb/dwc3/debug.h
+++ b/drivers/usb/dwc3/debug.h
@@ -217,11 +217,11 @@ static inline const char *dwc3_gadget_event_type_string(u8 event)
 void dwc3_trace(void (*trace)(struct va_format *), const char *fmt, ...);
 
 #ifdef CONFIG_DEBUG_FS
-extern int dwc3_debugfs_init(struct dwc3 *);
+extern void dwc3_debugfs_init(struct dwc3 *);
 extern void dwc3_debugfs_exit(struct dwc3 *);
 #else
-static inline int dwc3_debugfs_init(struct dwc3 *d)
-{  return 0;  }
+static inline void dwc3_debugfs_init(struct dwc3 *d)
+{  }
 static inline void dwc3_debugfs_exit(struct dwc3 *d)
 {  }
 #endif

diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c
index 8e78d331c89a4d56c78a571cd7bf52eb75341868..98ebc7bf0d519b23074759c4195806727c5230b0 100644 (file)
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@ -619,24 +619,23 @@ static const struct file_operations dwc3_link_state_fops = {
        .release                = single_release,
 };
 
-int dwc3_debugfs_init(struct dwc3 *dwc)
+void dwc3_debugfs_init(struct dwc3 *dwc)
 {
        struct dentry           *root;
-       struct dentry           *file;
-       int                     ret;
+       struct dentry           *file;
 
        root = debugfs_create_dir(dev_name(dwc->dev), NULL);
-       if (!root) {
-               ret = -ENOMEM;
-               goto err0;
+       if (IS_ERR_OR_NULL(root)) {
+               if (!root)
+                       dev_err(dwc->dev, "Can't create debugfs root\n");
+               return;
        }
-
        dwc->root = root;
 
        dwc->regset = kzalloc(sizeof(*dwc->regset), GFP_KERNEL);
        if (!dwc->regset) {
-               ret = -ENOMEM;
-               goto err1;
+               debugfs_remove_recursive(root);
+               return;
        }
 
        dwc->regset->regs = dwc3_regs;
@@ -644,47 +643,28 @@ int dwc3_debugfs_init(struct dwc3 *dwc)
        dwc->regset->base = dwc->regs;
 
        file = debugfs_create_regset32("regdump", S_IRUGO, root, dwc->regset);
-       if (!file) {
-               ret = -ENOMEM;
-               goto err2;
-       }
+       if (!file)
+               dev_dbg(dwc->dev, "Can't create debugfs regdump\n");
 
        if (IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)) {
                file = debugfs_create_file("mode", S_IRUGO | S_IWUSR, root,
                                dwc, &dwc3_mode_fops);
-               if (!file) {
-                       ret = -ENOMEM;
-                       goto err2;
-               }
+               if (!file)
+                       dev_dbg(dwc->dev, "Can't create debugfs mode\n");
        }
 
        if (IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) ||
                        IS_ENABLED(CONFIG_USB_DWC3_GADGET)) {
                file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root,
                                dwc, &dwc3_testmode_fops);
-               if (!file) {
-                       ret = -ENOMEM;
-                       goto err2;
-               }
-
-               file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR, root,
-                               dwc, &dwc3_link_state_fops);
-               if (!file) {
-                       ret = -ENOMEM;
-                       goto err2;
-               }
-       }
-
-       return 0;
+               if (!file)
+                       dev_dbg(dwc->dev, "Can't create debugfs testmode\n");
 
-err2:
-       kfree(dwc->regset);
-
-err1:
-       debugfs_remove_recursive(root);
-
-err0:
-       return ret;
+               file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR,
+                               root, dwc, &dwc3_link_state_fops);
+               if (!file)
+                       dev_dbg(dwc->dev, "Can't create debugfs link_state\n");
+       }
 }
 
 void dwc3_debugfs_exit(struct dwc3 *dwc)