From patchwork Fri Nov 4 10:43:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 80808 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1078734qge; Fri, 4 Nov 2016 03:42:08 -0700 (PDT) X-Received: by 10.98.44.212 with SMTP id s203mr25516520pfs.84.1478256128477; Fri, 04 Nov 2016 03:42:08 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p26si3919117pfk.183.2016.11.04.03.42.08; Fri, 04 Nov 2016 03:42:08 -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 S933428AbcKDKmD (ORCPT + 27 others); Fri, 4 Nov 2016 06:42:03 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:53708 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760185AbcKDKmB (ORCPT ); Fri, 4 Nov 2016 06:42:01 -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 uA4AebT3028031; Fri, 4 Nov 2016 19:40:52 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com uA4AebT3028031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478256053; bh=YTcq/to8iWxna1deYozNsEO5/GUMalqDjwoEZgLP8Ig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WyVK9ZXq99KmmQtAtC8w2Gw9jVApGBdEEJN5YutTdaVFT6nT9yVxLGyvPzNF/w0g/ VgSJCcQjS9gm+CLELnR5/AVHAPF/V8KRIeosyQNbuovv4vY3vbXEJSSeSfp8EGKsd5 XeJfSLzPILcuTd1fkwxP99CNh7PYNflY/ms3AV+yqYEYVXAq3OFyeV97gduigC5JQh e8UT8tI3uVtTku8XY8IsLb5Rn1DoOwL0YViE6gK4xV51sCo/l+lNAQeTzzpYN3L/hu ScQY7h1zT/4oePC5XG+YVinzucce0DOkVn7/skkC6MG77sTF0TKU3QrrA9XwMvEY0A 3glFWippylXtw== 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 18/22] mtd: nand: cafe: return error code of nand_scan_ident() on error Date: Fri, 4 Nov 2016 19:43:06 +0900 Message-Id: <1478256190-7452-19-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() returns an appropriate error value when it fails. Use it instead of the fixed error code -ENXIO. (This driver is already doing so for nand_scan_tail().) Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/cafe_nand.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 1.9.1 diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index 0b0c937..d40c32d 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c @@ -725,10 +725,9 @@ static int cafe_nand_probe(struct pci_dev *pdev, usedma = 0; /* Scan to find existence of the device */ - if (nand_scan_ident(mtd, 2, NULL)) { - err = -ENXIO; + err = nand_scan_ident(mtd, 2, NULL); + if (err) goto out_irq; - } cafe->dmabuf = dma_alloc_coherent(&cafe->pdev->dev, 2112 + sizeof(struct nand_buffers) +