From patchwork Fri Nov 4 10:43:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 80816 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1079008qge; Fri, 4 Nov 2016 03:42:59 -0700 (PDT) X-Received: by 10.98.214.20 with SMTP id r20mr25421692pfg.59.1478256179271; Fri, 04 Nov 2016 03:42:59 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xr4si13071925pab.68.2016.11.04.03.42.59; Fri, 04 Nov 2016 03:42:59 -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 S934444AbcKDKmn (ORCPT + 27 others); Fri, 4 Nov 2016 06:42:43 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:54994 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934210AbcKDKmj (ORCPT ); Fri, 4 Nov 2016 06:42:39 -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 uA4AebSw028031; Fri, 4 Nov 2016 19:40:48 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com uA4AebSw028031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1478256049; bh=jyAnJrQhGU2wRlh1TddtFHrx1CFkB9k0l70uSclnulI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iejToK/Ms8I5M4MSbGWeE4RWQz/2rlf6iLO4UV178CXgyqBuTUq71xHV4VMCbNTUg FcYrjXoOeaQXhDpfI0Mcy/SMV8lgYDRd2XGQH4QGzhCfGV4JzDyVA/e0Vgfpu0+LCC VbWY+DEV/dtz9NPfl6MOVwiRSEIYDko3efaqaxsAbG2nrt106UjuVGUKv7IUgRQ5hy FfQ4JRYYa6bGd7Gh6q+L3qhr22k4ZLz4IWN8aa/CbyBSj/DnQr++Fumi5rJdcAaN/h /uScYBzXhAOKCkOiE5du1k4Gj5U9PGevG+14Rre7hCTZ+Lq3M6vG2v2Ww4GpBPBloS UvD5iDDhH9kqg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , Sylvain Lemieux , linux-kernel@vger.kernel.org, Boris Brezillon , Brian Norris , Richard Weinberger , David Woodhouse , Vladimir Zapolskiy , linux-arm-kernel@lists.infradead.org Subject: [PATCH 13/22] mtd: nand: lpc32xx: return error code of nand_scan_ident/tail() on error Date: Fri, 4 Nov 2016 19:43:01 +0900 Message-Id: <1478256190-7452-14-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/lpc32xx_mlc.c | 10 ++++------ drivers/mtd/nand/lpc32xx_slc.c | 9 +++------ 2 files changed, 7 insertions(+), 12 deletions(-) -- 1.9.1 Acked-by: Vladimir Zapolskiy diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c index 8523881..5553a5d 100644 --- a/drivers/mtd/nand/lpc32xx_mlc.c +++ b/drivers/mtd/nand/lpc32xx_mlc.c @@ -747,10 +747,9 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) * Scan to find existance of the device and * Get the type of NAND device SMALL block or LARGE block */ - if (nand_scan_ident(mtd, 1, NULL)) { - res = -ENXIO; + res = nand_scan_ident(mtd, 1, NULL); + if (res) goto err_exit3; - } host->dma_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL); if (!host->dma_buf) { @@ -793,10 +792,9 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) * Fills out all the uninitialized function pointers with the defaults * And scans for a bad block table if appropriate. */ - if (nand_scan_tail(mtd)) { - res = -ENXIO; + res = nand_scan_tail(mtd); + if (res) goto err_exit4; - } mtd->name = DRV_NAME; diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c index 8d3edc3..f1094e5 100644 --- a/drivers/mtd/nand/lpc32xx_slc.c +++ b/drivers/mtd/nand/lpc32xx_slc.c @@ -894,10 +894,9 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) } /* Find NAND device */ - if (nand_scan_ident(mtd, 1, NULL)) { - res = -ENXIO; + res = nand_scan_ident(mtd, 1, NULL); + if (res) goto err_exit3; - } /* OOB and ECC CPU and DMA work areas */ host->ecc_buf = (uint32_t *)(host->data_buf + LPC32XX_DMA_DATA_SIZE); @@ -929,10 +928,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) /* * Fills out all the uninitialized function pointers with the defaults */ - if (nand_scan_tail(mtd)) { - res = -ENXIO; + res = nand_scan_tail(mtd); goto err_exit3; - } mtd->name = "nxp_lpc3220_slc"; res = mtd_device_register(mtd, host->ncfg->parts,