All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-mtd@lists.infradead.org
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>,
	Sylvain Lemieux <slemieux.tyco@gmail.com>,
	linux-kernel@vger.kernel.org,
	Boris Brezillon <boris.brezillon@free-electrons.com>,
	Brian Norris <computersforpeace@gmail.com>,
	Richard Weinberger <richard@nod.at>,
	David Woodhouse <dwmw2@infradead.org>,
	Vladimir Zapolskiy <vz@mleia.com>,
	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	[thread overview]
Message-ID: <1478256190-7452-14-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1478256190-7452-1-git-send-email-yamada.masahiro@socionext.com>

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 <yamada.masahiro@socionext.com>
---

 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);
 		goto err_exit3;
-	}
 
 	mtd->name = "nxp_lpc3220_slc";
 	res = mtd_device_register(mtd, host->ncfg->parts,
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: yamada.masahiro@socionext.com (Masahiro Yamada)
To: 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	[thread overview]
Message-ID: <1478256190-7452-14-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1478256190-7452-1-git-send-email-yamada.masahiro@socionext.com>

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 <yamada.masahiro@socionext.com>
---

 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);
 		goto err_exit3;
-	}
 
 	mtd->name = "nxp_lpc3220_slc";
 	res = mtd_device_register(mtd, host->ncfg->parts,
-- 
1.9.1

  parent reply	other threads:[~2016-11-04 10:42 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-04 10:42 [PATCH 00/22] mtd: nand: return error code of nand_scan(_ident,_tail) on error Masahiro Yamada
2016-11-04 10:42 ` [PATCH 00/22] mtd: nand: return error code of nand_scan(_ident, _tail) " Masahiro Yamada
2016-11-04 10:42 ` Masahiro Yamada
2016-11-04 10:42 ` [PATCH 01/22] mtd: nand: ams-delta: return error code of nand_scan() " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 02/22] mtd: nand: cmx270: " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 03/22] mtd: nand: cs553x: " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 04/22] mtd: nand: gpio: " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 05/22] mtd: nand: mpc5121: " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 06/22] mtd: nand: tmio: " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 07/22] mtd: nand: orion: " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 08/22] mtd: nand: pasemi: " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 09/22] mtd: nand: plat_nand: " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 10/22] mtd: nand: atmel: return error code of nand_scan_ident/tail() " Masahiro Yamada
2016-11-04 10:42 ` [PATCH 11/22] mtd: nand: brcmnand: " Masahiro Yamada
2016-11-04 10:43 ` [PATCH 12/22] mtd: nand: fsmc: " Masahiro Yamada
2016-11-04 10:43 ` Masahiro Yamada [this message]
2016-11-04 10:43   ` [PATCH 13/22] mtd: nand: lpc32xx: " Masahiro Yamada
2016-11-06  1:37   ` Vladimir Zapolskiy
2016-11-06  1:37     ` Vladimir Zapolskiy
2016-11-06 18:27   ` Boris Brezillon
2016-11-06 18:27     ` Boris Brezillon
2016-11-07  0:30     ` Vladimir Zapolskiy
2016-11-07  0:30       ` Vladimir Zapolskiy
2016-11-04 10:43 ` [PATCH 14/22] mtd: nand: mediatek: " Masahiro Yamada
2016-11-04 10:43   ` Masahiro Yamada
2016-11-04 10:43 ` [PATCH 15/22] mtd: nand: mxc: " Masahiro Yamada
2016-11-04 10:43 ` [PATCH 16/22] mtd: nand: omap2: " Masahiro Yamada
2016-11-04 10:43 ` [PATCH 17/22] mtd: nand: vf610: " Masahiro Yamada
2016-11-04 10:43 ` [PATCH 18/22] mtd: nand: cafe: return error code of nand_scan_ident() " Masahiro Yamada
2016-11-04 10:43 ` [PATCH 19/22] mtd: nand: hisi504: " Masahiro Yamada
2016-11-04 10:43 ` [PATCH 20/22] mtd: nand: pxa3xx: " Masahiro Yamada
2016-11-04 10:43 ` [PATCH 21/22] mtd: nand: nandsim: remove unneeded checks for nand_scan_ident/tail() Masahiro Yamada
2016-11-04 10:43 ` [PATCH 22/22] mtd: nand: socrates: use nand_scan() for nand_scan_ident/tail() combo Masahiro Yamada
2016-11-05  7:34 ` [PATCH 00/22] mtd: nand: return error code of nand_scan(_ident, _tail) on error Marek Vasut
2016-11-05  7:34   ` Marek Vasut
2016-11-06 22:55 ` [PATCH 00/22] mtd: nand: return error code of nand_scan(_ident,_tail) " Boris Brezillon
2016-11-06 22:55   ` Boris Brezillon
2016-11-06 22:55   ` Boris Brezillon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1478256190-7452-14-git-send-email-yamada.masahiro@socionext.com \
    --to=yamada.masahiro@socionext.com \
    --cc=boris.brezillon@free-electrons.com \
    --cc=computersforpeace@gmail.com \
    --cc=dwmw2@infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=richard@nod.at \
    --cc=slemieux.tyco@gmail.com \
    --cc=vz@mleia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.