Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1515131
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 13/22] mtd: nand: lpc32xx: return error code of nand_scan_ident/tail() on error |
| Date | 2016-11-04 11:50 +0100 |
| Message-ID | <szKen-yl-59@gated-at.bofh.it> (permalink) |
| References | <szKel-yl-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/22] mtd: nand: return error code of nand_scan(_ident,_tail) on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 07/22] mtd: nand: orion: return error code of nand_scan() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 01/22] mtd: nand: ams-delta: return error code of nand_scan() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 20/22] mtd: nand: pxa3xx: return error code of nand_scan_ident() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 19/22] mtd: nand: hisi504: return error code of nand_scan_ident() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 14/22] mtd: nand: mediatek: return error code of nand_scan_ident/tail() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 11/22] mtd: nand: brcmnand: return error code of nand_scan_ident/tail() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 17/22] mtd: nand: vf610: return error code of nand_scan_ident/tail() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 16/22] mtd: nand: omap2: return error code of nand_scan_ident/tail() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 12/22] mtd: nand: fsmc: return error code of nand_scan_ident/tail() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 08/22] mtd: nand: pasemi: return error code of nand_scan() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 18/22] mtd: nand: cafe: return error code of nand_scan_ident() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 21/22] mtd: nand: nandsim: remove unneeded checks for nand_scan_ident/tail() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 09/22] mtd: nand: plat_nand: return error code of nand_scan() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 10/22] mtd: nand: atmel: return error code of nand_scan_ident/tail() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 06/22] mtd: nand: tmio: return error code of nand_scan() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 22/22] mtd: nand: socrates: use nand_scan() for nand_scan_ident/tail() combo Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 15/22] mtd: nand: mxc: return error code of nand_scan_ident/tail() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 03/22] mtd: nand: cs553x: return error code of nand_scan() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 13/22] mtd: nand: lpc32xx: return error code of nand_scan_ident/tail() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
Re: [PATCH 13/22] mtd: nand: lpc32xx: return error code of nand_scan_ident/tail() on error Vladimir Zapolskiy <vz@mleia.com> - 2016-11-06 02:40 +0100
Re: [PATCH 13/22] mtd: nand: lpc32xx: return error code of nand_scan_ident/tail() on error Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-11-06 19:40 +0100
Re: [PATCH 13/22] mtd: nand: lpc32xx: return error code of nand_scan_ident/tail() on error Vladimir Zapolskiy <vz@mleia.com> - 2016-11-07 01:40 +0100
[PATCH 05/22] mtd: nand: mpc5121: return error code of nand_scan() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 02/22] mtd: nand: cmx270: return error code of nand_scan() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
[PATCH 04/22] mtd: nand: gpio: return error code of nand_scan() on error Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-11-04 11:50 +0100
Re: [PATCH 00/22] mtd: nand: return error code of nand_scan(_ident, _tail) on error Marek Vasut <marek.vasut@gmail.com> - 2016-11-05 08:40 +0100
Re: [PATCH 00/22] mtd: nand: return error code of nand_scan(_ident,_tail) on error Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-11-07 00:00 +0100
csiph-web