From patchwork Fri Nov 4 10:43:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 80811 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1078882qge; Fri, 4 Nov 2016 03:42:32 -0700 (PDT) X-Received: by 10.98.28.79 with SMTP id c76mr25376048pfc.8.1478256152741; Fri, 04 Nov 2016 03:42:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e80si15693126pfl.8.2016.11.04.03.42.32; Fri, 04 Nov 2016 03:42:32 -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 S934244AbcKDKmU (ORCPT + 27 others); Fri, 4 Nov 2016 06:42:20 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:54304 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934210AbcKDKmR (ORCPT ); Fri, 4 Nov 2016 06:42:17 -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 uA4AebSx028031; Fri, 4 Nov 2016 19:40:49 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com uA4AebSx028031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478256050; bh=L7gmnMdjEIIuAxq7JsTiWrp6Oc2+WmImJDSSgcTfy1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=avrNYYXgJSmRhN3PJFu6BqwWSTw/hs7mLAmiXOCPWBU4AZYVS6N19frm/KDvO8A0D IxR41QuIAA6ba3Kw/itCqJlhn6KazLlFkyv5R8qnqv+5MfMchYauNyrQMzio+Qj1gQ x/s35GdBrJN1394ErUVRFz3QalqrxbU//GfGAxvpmglmP1x9Cmgh/7kpcDeJFgAhkd 0PXu45rasLkGg9eg94udb7QJ4mv60+9Dh6728CsjijpvWdnX4Z01lznnd1KdgIMH+v 7Me4G1cHHwoAmJqe1ug7z5o5wDtPsL7xu/Q9E8HVPdgQaaJNjzAhxo8Xkz00iim7gT 3CFSTQJc8VDaQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Boris Brezillon , Brian Norris , Richard Weinberger , David Woodhouse , linux-mediatek@lists.infradead.org, Matthias Brugger Subject: [PATCH 14/22] mtd: nand: mediatek: return error code of nand_scan_ident/tail() on error Date: Fri, 4 Nov 2016 19:43:02 +0900 Message-Id: <1478256190-7452-15-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 -ENODEV. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/mtk_nand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c index 5223a21..6c3eed3 100644 --- a/drivers/mtd/nand/mtk_nand.c +++ b/drivers/mtd/nand/mtk_nand.c @@ -1297,7 +1297,7 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc, ret = nand_scan_ident(mtd, nsels, NULL); if (ret) - return -ENODEV; + return ret; /* store bbt magic in page, cause OOB is not protected */ if (nand->bbt_options & NAND_BBT_USE_FLASH) @@ -1323,7 +1323,7 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc, ret = nand_scan_tail(mtd); if (ret) - return -ENODEV; + return ret; ret = mtd_device_parse_register(mtd, NULL, NULL, NULL, 0); if (ret) {