From: Luis de Bethencourt <luisbg@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: johnny.kim@atmel.com, austin.shin@atmel.com,
chris.park@atmel.com, tony.cho@atmel.com, glen.lee@atmel.com,
leo.kim@atmel.com, gregkh@linuxfoundation.org,
linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org,
Luis de Bethencourt <luisbg@osg.samsung.com>
Subject: [PATCH] staging: wilc1000: fix error handling in wilc_debugfs_init()
Date: Wed, 22 Jun 2016 13:39:14 +0100 [thread overview]
Message-ID: <1466599154-4782-1-git-send-email-luisbg@osg.samsung.com> (raw)
The common format to check if a function returned an error pointer is to
use PTR_ERR(). Instead of ERR_PTR() which is used to return said errors.
Also, if there was an error returning -EINVAL instead of -1 is more
appropriate.
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
---
drivers/staging/wilc1000/wilc_debugfs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_debugfs.c b/drivers/staging/wilc1000/wilc_debugfs.c
index fcbc95d..6252931 100644
--- a/drivers/staging/wilc1000/wilc_debugfs.c
+++ b/drivers/staging/wilc1000/wilc_debugfs.c
@@ -107,7 +107,7 @@ static int __init wilc_debugfs_init(void)
struct wilc_debugfs_info_t *info;
wilc_dir = debugfs_create_dir("wilc_wifi", NULL);
- if (wilc_dir == ERR_PTR(-ENODEV)) {
+ if (PTR_ERR(wilc_dir) == -ENODEV) {
/* it's not error. the debugfs is just not being enabled. */
printk("ERR, kernel has built without debugfs support\n");
return 0;
@@ -115,7 +115,7 @@ static int __init wilc_debugfs_init(void)
if (!wilc_dir) {
printk("ERR, debugfs create dir\n");
- return -1;
+ return -EINVAL;
}
for (i = 0; i < ARRAY_SIZE(debugfs_info); i++) {
@@ -129,7 +129,7 @@ static int __init wilc_debugfs_init(void)
if (!debugfs_files) {
printk("ERR fail to create the debugfs file, %s\n", info->name);
debugfs_remove_recursive(wilc_dir);
- return -1;
+ return -EINVAL;
}
}
return 0;
--
2.5.1
next reply other threads:[~2016-06-22 12:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 12:39 Luis de Bethencourt [this message]
2016-06-23 1:29 ` [PATCH] staging: wilc1000: fix error handling in wilc_debugfs_init() Julian Calaby
2016-06-23 11:25 ` Luis de Bethencourt
2016-06-23 11:29 ` Julian Calaby
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=1466599154-4782-1-git-send-email-luisbg@osg.samsung.com \
--to=luisbg@osg.samsung.com \
--cc=austin.shin@atmel.com \
--cc=chris.park@atmel.com \
--cc=devel@driverdev.osuosl.org \
--cc=glen.lee@atmel.com \
--cc=gregkh@linuxfoundation.org \
--cc=johnny.kim@atmel.com \
--cc=leo.kim@atmel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=tony.cho@atmel.com \
/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;
as well as URLs for NNTP newsgroup(s).