Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751549AbcKFShl (ORCPT ); Sun, 6 Nov 2016 13:37:41 -0500 Received: from up.free-electrons.com ([163.172.77.33]:60777 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751223AbcKFShk (ORCPT ); Sun, 6 Nov 2016 13:37:40 -0500 Date: Sun, 6 Nov 2016 19:27:43 +0100 From: Boris Brezillon To: Masahiro Yamada Cc: linux-mtd@lists.infradead.org, Sylvain Lemieux , linux-kernel@vger.kernel.org, Brian Norris , Richard Weinberger , David Woodhouse , Vladimir Zapolskiy , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 13/22] mtd: nand: lpc32xx: return error code of nand_scan_ident/tail() on error Message-ID: <20161106192743.00e401ec@bbrezillon> In-Reply-To: <1478256190-7452-14-git-send-email-yamada.masahiro@socionext.com> References: <1478256190-7452-1-git-send-email-yamada.masahiro@socionext.com> <1478256190-7452-14-git-send-email-yamada.masahiro@socionext.com> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2498 Lines: 81 On Fri, 4 Nov 2016 19:43:01 +0900 Masahiro Yamada wrote: > 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(-) > > 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); You miss if (res) here. No need to resend, I'll fix it when applying the patches. > goto err_exit3; > - } > > mtd->name = "nxp_lpc3220_slc"; > res = mtd_device_register(mtd, host->ncfg->parts,