From patchwork Fri Nov 4 10:43:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 80826 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1080012qge; Fri, 4 Nov 2016 03:46:06 -0700 (PDT) X-Received: by 10.98.211.67 with SMTP id q64mr25222199pfg.173.1478256366656; Fri, 04 Nov 2016 03:46:06 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sz2si2394241pab.55.2016.11.04.03.46.06; Fri, 04 Nov 2016 03:46:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761603AbcKDKp5 (ORCPT + 27 others); Fri, 4 Nov 2016 06:45:57 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:53949 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933470AbcKDKmH (ORCPT ); Fri, 4 Nov 2016 06:42:07 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id uA4AebSv028031; Fri, 4 Nov 2016 19:40:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com uA4AebSv028031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478256048; bh=5T38QRpdq/LfQQ4GO27Eo2+PaMTQ85Ngd4MOMu7pqEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S6jhOoQ0QJO3cqc81HWMRkxPesVID3vjALE9FNdrY2jBV2A2tTYZYqPE4/DncEosG 14uAk11apr7DyteOcsfnStjnUHbedLubuTk/E8dLF64af1+hGNrtbFoawrGRfZ8XXj IxF7svrbTzrzgKf8n8NiofwER8VNA2JtlFjcJ25GeM0xxyhRB++SvPghaKERvc6CUA L1mq2qSE+xGGFQ337AWBMetjZ9ejOkif9SfksA7elHnjNng+IFzeoJIjLN8J+2Zs6T 5OAwAS6xQBjTXSi4BK5Z5QmSvxn5S2XRrXvr0J7AIwbxF3Nqq8wLmjY8kQxVPPjDX1 HR3rQtRIiba0Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org, Boris Brezillon , Brian Norris , Richard Weinberger , David Woodhouse Subject: [PATCH 12/22] mtd: nand: fsmc: return error code of nand_scan_ident/tail() on error Date: Fri, 4 Nov 2016 19:43:00 +0900 Message-Id: <1478256190-7452-13-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478256190-7452-1-git-send-email-yamada.masahiro@socionext.com> References: <1478256190-7452-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The nand_scan_ident/tail() returns an appropriate error value when it fails. Use it instead of the fixed error code -ENXIO. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/fsmc_nand.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index d4f454a..4924b43 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c @@ -926,8 +926,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) /* * Scan to find existence of the device */ - if (nand_scan_ident(mtd, 1, NULL)) { - ret = -ENXIO; + ret = nand_scan_ident(mtd, 1, NULL); + if (ret) { dev_err(&pdev->dev, "No NAND Device found!\n"); goto err_scan_ident; } @@ -992,10 +992,9 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) } /* Second stage of scan to fill MTD data-structures */ - if (nand_scan_tail(mtd)) { - ret = -ENXIO; + ret = nand_scan_tail(mtd); + if (ret) goto err_probe; - } /* * The partition information can is accessed by (in the same precedence)