From patchwork Fri Nov 4 10:42:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 80821 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1079333qge; Fri, 4 Nov 2016 03:43:55 -0700 (PDT) X-Received: by 10.99.55.66 with SMTP id g2mr20860864pgn.65.1478256235557; Fri, 04 Nov 2016 03:43:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l7si15674091pga.269.2016.11.04.03.43.55; Fri, 04 Nov 2016 03:43:55 -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 S934268AbcKDKmY (ORCPT + 27 others); Fri, 4 Nov 2016 06:42:24 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:54435 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934235AbcKDKmV (ORCPT ); Fri, 4 Nov 2016 06:42:21 -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 uA4AebSt028031; Fri, 4 Nov 2016 19:40:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com uA4AebSt028031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478256046; bh=X7hgXyg88LQH1BZ4iMb6npFHD1QYZm+TBGN9q3K66NE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zbqY5aDrCTE8JiKKlwk/iDK0RNUR90fMtXD6RhtxwNwWz1QmD4c3CeHhgVDa0iVYp MNAS0Ab0pNQWp90o43qbDpDxcfwhqvbkdlGQTtDZkzBNDyOaJxT1skEJmT+LhO6jqY 6GcMdaLCVlSvUBbhtJDRSAJcRiCXJ748fDrRGb1nx0GekaiSDaMt/5GiHWPCmHHkLE 7oLuI5qDjMAJOEXJSMQX0DVtlfWVzERzfyf9iRL7Mb5B9l+dzM0spyuGPwWX+69yvt uYjxF2ieE7F5e8u3/lyGYOK8gqNnc1xb4Ko/VSTyXpQyQ3ZB7WdMFneKa0EPaZpRPM 3/ffrGWAbCfKQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , Josh Wu , linux-kernel@vger.kernel.org, Boris Brezillon , Brian Norris , Richard Weinberger , David Woodhouse , Wenyou Yang Subject: [PATCH 10/22] mtd: nand: atmel: return error code of nand_scan_ident/tail() on error Date: Fri, 4 Nov 2016 19:42:58 +0900 Message-Id: <1478256190-7452-11-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/atmel_nand.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 68b9160..9ebd5ec 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -2267,10 +2267,9 @@ static int atmel_nand_probe(struct platform_device *pdev) dev_info(host->dev, "No DMA support for NAND access.\n"); /* first scan to find the device and get the page size */ - if (nand_scan_ident(mtd, 1, NULL)) { - res = -ENXIO; + res = nand_scan_ident(mtd, 1, NULL); + if (res) goto err_scan_ident; - } if (host->board.on_flash_bbt || on_flash_bbt) nand_chip->bbt_options |= NAND_BBT_USE_FLASH; @@ -2304,10 +2303,9 @@ static int atmel_nand_probe(struct platform_device *pdev) } /* second phase scan */ - if (nand_scan_tail(mtd)) { - res = -ENXIO; + res = nand_scan_tail(mtd); + if (res) goto err_scan_tail; - } mtd->name = "atmel_nand"; res = mtd_device_register(mtd, host->board.parts,