From patchwork Wed Nov 9 04:35:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 81438 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp16896qge; Tue, 8 Nov 2016 20:35:23 -0800 (PST) X-Received: by 10.99.133.200 with SMTP id u191mr11952183pgd.28.1478666123181; Tue, 08 Nov 2016 20:35:23 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 13si40136529pfv.89.2016.11.08.20.35.22; Tue, 08 Nov 2016 20:35:23 -0800 (PST) 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 S1753186AbcKIEfE (ORCPT + 27 others); Tue, 8 Nov 2016 23:35:04 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:44260 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753107AbcKIEfB (ORCPT ); Tue, 8 Nov 2016 23:35:01 -0500 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id uA94WsgK025515; Wed, 9 Nov 2016 13:33:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com uA94WsgK025515 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478665986; bh=yKt3oy104dnhXLL4t32uL9RexKwR3p6W8HHCnjbYnvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j9J8zvwP5hp/9IxXfaIG1drjwjyewJyHMc7jyLXneoDY33MtlJGaDI+ziBf17RNty ff3NhVBhOSS5YIPkyowc/9lWsbOqpaMD2awQT6fclA2vqQSTMm3KoOZoQiV2qoe70E hXDg8rZlA8m8oN0NCYw9aJQxeepf3mKYG5XTUjgtXOkPXWfuSso418oLwTaS8dhU9s oR4Khrq4GuUbhIuYuti/TbAtF97GQeJMdP2QwanJ4yT4C2d2tcKLp9mEjtH9LY2VHU y3gdriAykUGY4I7suRXZU51oybiFWs1sTO7j2Zpk//+BqDVNuRapoXdC4NuWakP3Tb HAuTATlorMbXA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Alan Cox , David Woodhouse , Jason Roberts , Chuanxiao Dong , Dinh Nguyen , Masahiro Yamada , linux-kernel@vger.kernel.org, Boris Brezillon , Marek Vasut , Brian Norris , Richard Weinberger , David Woodhouse , Cyrille Pitchen Subject: [PATCH 09/11] mtd: nand: denali: return error code from nand_scan_ident/tail on error Date: Wed, 9 Nov 2016 13:35:28 +0900 Message-Id: <1478666130-13413-10-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478666130-13413-1-git-send-email-yamada.masahiro@socionext.com> References: <1478666130-13413-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 -ENXIO. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/denali.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 1.9.1 Reviewed-by: Marek Vasut diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index f188a48..d482d8d 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -1474,10 +1474,9 @@ int denali_init(struct denali_nand_info *denali) * this is the first stage in a two step process to register * with the nand subsystem */ - if (nand_scan_ident(mtd, denali->max_banks, NULL)) { - ret = -ENXIO; + ret = nand_scan_ident(mtd, denali->max_banks, NULL); + if (ret) goto failed_req_irq; - } /* allocate the right size buffer now */ devm_kfree(denali->dev, denali->buf.buf); @@ -1580,10 +1579,9 @@ int denali_init(struct denali_nand_info *denali) denali->nand.ecc.write_oob = denali_write_oob; denali->nand.erase = denali_erase; - if (nand_scan_tail(mtd)) { - ret = -ENXIO; + ret = nand_scan_tail(mtd); + if (ret) goto failed_req_irq; - } ret = mtd_device_register(mtd, NULL, 0); if (ret) {