Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1428750

[PATCH] staging: wilc1000: fix error handling in wilc_debugfs_init()

Show all headers | View 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] staging: wilc1000: fix error handling in wilc_debugfs_init() Luis de Bethencourt <luisbg@osg.samsung.com> - 2016-06-22 14:40 +0200
  Re: [PATCH] staging: wilc1000: fix error handling in wilc_debugfs_init() Julian Calaby <julian.calaby@gmail.com> - 2016-06-23 03:40 +0200
    Re: [PATCH] staging: wilc1000: fix error handling in wilc_debugfs_init() Julian Calaby <julian.calaby@gmail.com> - 2016-06-23 13:30 +0200
    Re: [PATCH] staging: wilc1000: fix error handling in wilc_debugfs_init() Luis de Bethencourt <luisbg@osg.samsung.com> - 2016-06-23 13:30 +0200

csiph-web