Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1515118

[PATCH 11/22] mtd: nand: brcmnand: return error code of nand_scan_ident/tail() on error

Show all headers | View raw

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/brcmnand/brcmnand.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index 9d2424b..42ebd73 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -2209,8 +2209,9 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
 	nand_writereg(ctrl, cfg_offs,
 		      nand_readreg(ctrl, cfg_offs) & ~CFG_BUS_WIDTH);
 
-	if (nand_scan_ident(mtd, 1, NULL))
-		return -ENXIO;
+	ret = nand_scan_ident(mtd, 1, NULL);
+	if (ret)
+		return ret;
 
 	chip->options |= NAND_NO_SUBPAGE_WRITE;
 	/*
@@ -2234,8 +2235,9 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
 	if (ret)
 		return ret;
 
-	if (nand_scan_tail(mtd))
-		return -ENXIO;
+	ret = nand_scan_tail(mtd);
+	if (ret)
+		return ret;
 
 	return mtd_device_register(mtd, NULL, 0);
 }
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

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