From patchwork Wed Nov 16 08:02:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 695461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tJcHp54r8z9t26 for ; Wed, 16 Nov 2016 19:05:10 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OfRkQbSe"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c6vBl-0000aw-7X; Wed, 16 Nov 2016 08:03:25 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c6vBi-0000Z2-A9 for linux-mtd@lists.infradead.org; Wed, 16 Nov 2016 08:03:23 +0000 Received: by mail-wm0-x243.google.com with SMTP id g23so8358741wme.1 for ; Wed, 16 Nov 2016 00:03:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=TYc8hR/+0JtltFemRm+jMmfF+M6WfiOAa0l+cPxa7eo=; b=OfRkQbSeeBDPksKN4pzO6hcurH0sZct231CJLPmNslSf56RaCuVbzA+s9NpO1mW9QE Cio5lUOyxhryrhFhMVNtruGQWNQp9gtDy+5YDlKntM3Wcjz5TwH6Z2xYJGKtvvlLyVA2 Xzvp4ZEw1hFnfSFAp4QOM/twU+eyliNJqjinPVzIW+CihDYS/0m/zrmv4qqn8f8TUxCT rodHycFa1x0Yh5E/5jgotOYuS8AHtC134Bo6seqjCXcI+qG2OIMzXdBqupJbb+71THBB O1OGqIARMxWPMbQ9Ri///RURqWhhzUvuKHkv1bF+3Am/y7Sz/M5bCnBrHGeaaae5ot6d sviw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TYc8hR/+0JtltFemRm+jMmfF+M6WfiOAa0l+cPxa7eo=; b=SvySjjR0mBz/qJbxrw4YXAy21vGZSFY/QxAdUD1k00YLem5O+Nedr5R7u3RNq8QfdN K+tRkbe9RbHYp9zpNf78sXAC09AorygUhjluV9rTSdNhrolB2/24rgiFfGhz22glsRVX RdzD7KvLTnDp/vPWIvN65DlMvjk2Ov5XGmwkuujujIv/V+MYPhYDI3fVmnNk6Ng/TkFA BbIlePWhfl8Y5CbNW3Nx3H0PSggBfJbiSY02obAAZi1SGCwJfNtNnJNye531sD2D4RgU W0HrnEWVf8VH9j+j2ldoQ0a7+LEMuOl8uSYXqZOusvRipBaa7GR0edYhi0u2SSPtBtZ3 9XvA== X-Gm-Message-State: ABUngvfjSsA23NlaS8Ac0VUzWqPyWKMXkghMEAo/debHCuCTbJffvXNfmxhmiGQKZ8n1JQ== X-Received: by 10.28.158.148 with SMTP id h142mr8539646wme.59.1479283380233; Wed, 16 Nov 2016 00:03:00 -0800 (PST) Received: from sudip-laptop.Home (05471f2c.skybroadband.com. [5.71.31.44]) by smtp.gmail.com with ESMTPSA id ei2sm24914467wjd.47.2016.11.16.00.02.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Nov 2016 00:02:59 -0800 (PST) From: Sudip Mukherjee To: Boris Brezillon , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen Subject: [PATCH v2] mtd: nand: nandsim: fix error check Date: Wed, 16 Nov 2016 08:02:55 +0000 Message-Id: <1479283375-4335-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161116_000322_527101_21F1A6CF X-CRM114-Status: GOOD ( 13.57 ) X-Spam-Score: -1.0 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 FSL_HELO_HOME No description available. -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sudipm.mukherjee[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, Sudip Mukherjee MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org debugfs_create_dir() and debugfs_create_file() returns NULL on error or a pointer on success. They do not return the error value with ERR_PTR. So we should not check the return with IS_ERR_OR_NULL, instead we should just check for NULL. Signed-off-by: Sudip Mukherjee --- v2: nuked err drivers/mtd/nand/nandsim.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index c76287a..c847426 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c @@ -525,24 +525,20 @@ static int nandsim_debugfs_create(struct nandsim *dev) { struct nandsim_debug_info *dbg = &dev->dbg; struct dentry *dent; - int err; if (!IS_ENABLED(CONFIG_DEBUG_FS)) return 0; dent = debugfs_create_dir("nandsim", NULL); - if (IS_ERR_OR_NULL(dent)) { - int err = dent ? -ENODEV : PTR_ERR(dent); - - NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n", - err); - return err; + if (!dent) { + NS_ERR("cannot create \"nandsim\" debugfs directory\n"); + return -ENODEV; } dbg->dfs_root = dent; dent = debugfs_create_file("wear_report", S_IRUSR, dbg->dfs_root, dev, &dfs_fops); - if (IS_ERR_OR_NULL(dent)) + if (!dent) goto out_remove; dbg->dfs_wear_report = dent; @@ -550,8 +546,7 @@ static int nandsim_debugfs_create(struct nandsim *dev) out_remove: debugfs_remove_recursive(dbg->dfs_root); - err = dent ? PTR_ERR(dent) : -ENODEV; - return err; + return -ENODEV; } /**