]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
usb: dwc3: debugfs: improve debugfs file creation
authorFelipe Balbi <balbi@ti.com>
Fri, 22 Feb 2013 14:24:49 +0000 (16:24 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 18 Mar 2013 09:17:15 +0000 (11:17 +0200)
when commit 388e5c5 (usb: dwc3: remove dwc3
dependency on host AND gadget.) changed the
way debugfs files are created, it failed to
note that 'mode' is necessary in Dual Role
mode only while 'testmode' and 'link_state'
are valid in Dual Role and Peripheral-only
builds. Fix this while also converting pre-
processor conditional to C conditionals.

Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/dwc3/debugfs.c

index a1bac9a07837d3382f271834d9a137db0f263ffc..8b23d0455b1c1b6ea8a54c5aa6d314dc0c5545ed 100644 (file)
@@ -667,28 +667,31 @@ int dwc3_debugfs_init(struct dwc3 *dwc)
                goto err1;
        }
 
-#if IS_ENABLED(CONFIG_USB_DWC3_GADGET)
-       file = debugfs_create_file("mode", S_IRUGO | S_IWUSR, root,
-                       dwc, &dwc3_mode_fops);
-       if (!file) {
-               ret = -ENOMEM;
-               goto err1;
+       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 err1;
+               }
        }
 
-       file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root,
-                       dwc, &dwc3_testmode_fops);
-       if (!file) {
-               ret = -ENOMEM;
-               goto err1;
-       }
-
-       file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR, root,
-                       dwc, &dwc3_link_state_fops);
-       if (!file) {
-               ret = -ENOMEM;
-               goto err1;
+       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 err1;
+               }
+
+               file = debugfs_create_file("link_state", S_IRUGO | S_IWUSR, root,
+                               dwc, &dwc3_link_state_fops);
+               if (!file) {
+                       ret = -ENOMEM;
+                       goto err1;
+               }
        }
-#endif
 
        return 0;