From patchwork Fri Nov 4 10:43:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 80825 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1079900qge; Fri, 4 Nov 2016 03:45:50 -0700 (PDT) X-Received: by 10.98.152.212 with SMTP id d81mr25894828pfk.12.1478256350368; Fri, 04 Nov 2016 03:45:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m12si15679064pgd.258.2016.11.04.03.45.50; Fri, 04 Nov 2016 03:45:50 -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 S1761572AbcKDKpm (ORCPT + 27 others); Fri, 4 Nov 2016 06:45:42 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:53941 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933471AbcKDKmH (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 uA4AebT0028031; Fri, 4 Nov 2016 19:40:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com uA4AebT0028031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478256051; bh=lg/q1hXLmqeZpzbeXb5I9nydm5rO+51DEFWJBi20TFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hp7G8QU0iKsQ4uH22DIEQL1Hjzj9kxAqKXtXBRKggjUr92zz3E/1PahSY3nk1Vucc ptllH/8SffFVHibmNcwfmMNLhrvvyCgtpOM88cZOIt5JpaX+OvheefrIxK8SVXp96J y5/tR0zX19W4SjRjNv7Zn0fmq/Mr3qBI3ohK1P+aH30QTQp3e/M2LiPo6paMzbtxgB rrOCvLpp2sTTD1Xo7aMoo+57h/gA5UgAKS0wxmJGV/TCLWPo/AjmjmK7gpWLxNJW4C Lh2Vv8YTzRkhw8NyQNxhX32T/21nD448D2e/yO0zTcCQ7RCYx9Ct8LCSP06Zk0aqE8 UnGHJtBzkXWHA== 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 15/22] mtd: nand: mxc: return error code of nand_scan_ident/tail() on error Date: Fri, 4 Nov 2016 19:43:03 +0900 Message-Id: <1478256190-7452-16-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/mxc_nand.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index d7f724b..61ca020 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -1747,10 +1747,9 @@ static int mxcnd_probe(struct platform_device *pdev) } /* first scan to find the device and get the page size */ - if (nand_scan_ident(mtd, is_imx25_nfc(host) ? 4 : 1, NULL)) { - err = -ENXIO; + err = nand_scan_ident(mtd, is_imx25_nfc(host) ? 4 : 1, NULL); + if (err) goto escan; - } switch (this->ecc.mode) { case NAND_ECC_HW: @@ -1808,10 +1807,9 @@ static int mxcnd_probe(struct platform_device *pdev) } /* second phase scan */ - if (nand_scan_tail(mtd)) { - err = -ENXIO; + err = nand_scan_tail(mtd); + if (err) goto escan; - } /* Register the partitions */ mtd_device_parse_register(mtd, part_probes,