From: changbin.du@intel.com
To: balbi@kernel.org
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, "Du,
Changbin" <changbin.du@intel.com>
Subject: [PATCH v2 1/3] usb: dwc3: make dwc3_debugfs_init return value be void
Date: Wed, 6 Apr 2016 23:44:04 +0800 [thread overview]
Message-ID: <1459957446-6854-2-git-send-email-changbin.du@intel.com> (raw)
In-Reply-To: <1459957446-6854-1-git-send-email-changbin.du@intel.com>
In-Reply-To: <20160406092509.GA29930@kroah.com>
From: "Du, Changbin" <changbin.du@intel.com>
Debugfs init failure is not so important. We can continue our job on
this failure. Also no need to check debugfs_create_file call results.
Signed-off-by: Du, Changbin <changbin.du@intel.com>
---
drivers/usb/dwc3/core.c | 10 +---------
drivers/usb/dwc3/debug.h | 6 +++---
drivers/usb/dwc3/debugfs.c | 50 ++++++++++------------------------------------
3 files changed, 14 insertions(+), 52 deletions(-)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 17fd814..30f825c 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1062,19 +1062,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 07fbc2d..71e3180 100644
--- 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 9ac37fe..071b286 100644
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@ -618,69 +618,39 @@ 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;
root = debugfs_create_dir(dev_name(dwc->dev), NULL);
- if (!root) {
- ret = -ENOMEM;
- goto err0;
- }
+ if (IS_ERR_OR_NULL(root))
+ 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;
dwc->regset->nregs = ARRAY_SIZE(dwc3_regs);
dwc->regset->base = dwc->regs;
- file = debugfs_create_regset32("regdump", S_IRUGO, root, dwc->regset);
- if (!file) {
- ret = -ENOMEM;
- goto err1;
- }
+ debugfs_create_regset32("regdump", S_IRUGO, root, dwc->regset);
- if (IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)) {
- file = debugfs_create_file("mode", S_IRUGO | S_IWUSR, root,
+ if (IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE))
+ 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) ||
IS_ENABLED(CONFIG_USB_DWC3_GADGET)) {
- file = debugfs_create_file("testmode", S_IRUGO | S_IWUSR, root,
+ 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,
+ debugfs_create_file("link_state", S_IRUGO | S_IWUSR, root,
dwc, &dwc3_link_state_fops);
- if (!file) {
- ret = -ENOMEM;
- goto err1;
- }
}
-
- return 0;
-
-err1:
- debugfs_remove_recursive(root);
-
-err0:
- return ret;
}
void dwc3_debugfs_exit(struct dwc3 *dwc)
--
2.5.0
next prev parent reply other threads:[~2016-04-06 15:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 8:27 [PATCH] usb: dwc3: add debugfs node to dump FIFO/Queue available space changbin.du
2016-04-06 9:25 ` Greg KH
2016-04-06 11:38 ` Du, Changbin
2016-04-06 12:24 ` Felipe Balbi
2016-04-06 15:44 ` [PATCH v2 0/3] Improvement, fix and new entry for dwc3 debugfs changbin.du
2016-04-07 5:05 ` Felipe Balbi
2016-04-07 5:21 ` Du, Changbin
2016-04-07 5:22 ` Felipe Balbi
2016-04-08 9:34 ` [PATCH v3 0/2] Add a new debugfs entry to dump FIFO/Queue available space changbin.du
2016-04-08 9:34 ` [PATCH v3 1/2] usb: dwc3: make dwc3_debugfs_init return value be void changbin.du
2016-04-11 8:14 ` Felipe Balbi
2016-04-11 11:19 ` Du, Changbin
2016-04-11 11:23 ` Felipe Balbi
2016-04-12 11:10 ` [PATCH v4 0/2] Add a new debugfs entry to dump FIFO/Queue available space changbin.du
2016-04-12 11:10 ` [PATCH v4 1/2] usb: dwc3: make dwc3_debugfs_init return value be void changbin.du
2016-04-12 11:10 ` [PATCH v4 2/2] usb: dwc3: add debugfs node to dump FIFO/Queue available space changbin.du
2016-04-12 12:58 ` Sergei Shtylyov
2016-04-14 3:27 ` Du, Changbin
2016-04-14 8:02 ` Felipe Balbi
2016-04-14 11:15 ` Du, Changbin
2016-04-14 11:18 ` Felipe Balbi
2016-04-14 11:37 ` Du, Changbin
2016-04-14 11:41 ` Felipe Balbi
2016-04-14 11:58 ` Du, Changbin
2016-04-08 9:34 ` [PATCH v3 " changbin.du
2016-04-06 15:44 ` changbin.du [this message]
2016-04-06 15:44 ` [PATCH v2 2/3] usb: dwc3: free dwc->regset on dwc3_debugfs_exit changbin.du
2016-04-06 21:08 ` Greg KH
2016-04-07 5:05 ` Felipe Balbi
2016-04-06 15:44 ` [PATCH v2 3/3] usb: dwc3: add debugfs node to dump FIFO/Queue available space changbin.du
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459957446-6854-2-git-send-email-changbin.du@intel.com \
--to=changbin.du@intel.com \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome