From patchwork Wed Jun 22 12:39:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis de Bethencourt X-Patchwork-Id: 9192669 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E50F601C0 for ; Wed, 22 Jun 2016 12:39:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EF10283E9 for ; Wed, 22 Jun 2016 12:39:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2366D283FE; Wed, 22 Jun 2016 12:39:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33BD9283E9 for ; Wed, 22 Jun 2016 12:39:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752360AbcFVMja (ORCPT ); Wed, 22 Jun 2016 08:39:30 -0400 Received: from lists.s-osg.org ([54.187.51.154]:49312 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751667AbcFVMj3 (ORCPT ); Wed, 22 Jun 2016 08:39:29 -0400 Received: from snow.seri.co.uk (cpc9-slam5-2-0-cust824.2-4.cable.virginm.net [81.108.163.57]) by lists.s-osg.org (Postfix) with ESMTPSA id CA577E269C; Wed, 22 Jun 2016 05:40:21 -0700 (PDT) From: Luis de Bethencourt 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 Subject: [PATCH] staging: wilc1000: fix error handling in wilc_debugfs_init() Date: Wed, 22 Jun 2016 13:39:14 +0100 Message-Id: <1466599154-4782-1-git-send-email-luisbg@osg.samsung.com> X-Mailer: git-send-email 2.5.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Julian Calaby --- 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;