From patchwork Fri Nov 4 10:42:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 80819 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1079194qge; Fri, 4 Nov 2016 03:43:31 -0700 (PDT) X-Received: by 10.98.112.195 with SMTP id l186mr25270179pfc.35.1478256211116; Fri, 04 Nov 2016 03:43:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hv9si13098803pad.44.2016.11.04.03.43.30; Fri, 04 Nov 2016 03:43:31 -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 S934518AbcKDKn0 (ORCPT + 27 others); Fri, 4 Nov 2016 06:43:26 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:54741 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934322AbcKDKmb (ORCPT ); Fri, 4 Nov 2016 06:42:31 -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 uA4AebSu028031; Fri, 4 Nov 2016 19:40:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com uA4AebSu028031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478256047; bh=DC5jmEa9yb8hYaAbhwG5cwiXpjHNxjHIKjFFGxNjcxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kIVUH5VcctJfs1sNS6drw0FfTujyKU5Gq6KZuQ5fcH2enO/DwqkfaQFofR8cYQ2GS CpsEJDTAJeht8pUVDdjSeCxuj8FKDY2yuRnVx+EZ0Z/nMNrIZpplOsRRUuL7I7zll/ tTqdJ4pQYSAeP9UaU0X8ADgJQtVFRm7keqW8S0bj8e8IwPOT7h+UcgHFc2BIZPtgF2 oLV1hub+IM2DH6nKyEunyzM9oJGMslu8oO96ZNMSVB8ejCqtdoi2vhPxzsjX0MSFk5 Ki0G1n/DMz8KkB8JtXW5kOXYic1bpRYHYMz8pnEPW2yPaixlCcNrm6YHESUUEj8fue KyQcMy5YYfTBQ== 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 , Kamal Dasu , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 11/22] mtd: nand: brcmnand: return error code of nand_scan_ident/tail() on error Date: Fri, 4 Nov 2016 19:42:59 +0900 Message-Id: <1478256190-7452-12-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/brcmnand/brcmnand.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index 9d2424b..42ebd73 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -2209,8 +2209,9 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) nand_writereg(ctrl, cfg_offs, nand_readreg(ctrl, cfg_offs) & ~CFG_BUS_WIDTH); - if (nand_scan_ident(mtd, 1, NULL)) - return -ENXIO; + ret = nand_scan_ident(mtd, 1, NULL); + if (ret) + return ret; chip->options |= NAND_NO_SUBPAGE_WRITE; /* @@ -2234,8 +2235,9 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) if (ret) return ret; - if (nand_scan_tail(mtd)) - return -ENXIO; + ret = nand_scan_tail(mtd); + if (ret) + return ret; return mtd_device_register(mtd, NULL, 0); }