From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-mtd@lists.infradead.org
Cc: Masahiro Yamada <yamada.masahiro@socionext.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>
Subject: [PATCH 16/22] mtd: nand: omap2: return error code of nand_scan_ident/tail() on error
Date: Fri, 4 Nov 2016 19:43:04 +0900 [thread overview]
Message-ID: <1478256190-7452-17-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/omap2.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 5513bfd9..6c985d3 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1895,10 +1895,10 @@ static int omap_nand_probe(struct platform_device *pdev)
/* scan NAND device connected to chip controller */
nand_chip->options |= info->devsize & NAND_BUSWIDTH_16;
- if (nand_scan_ident(mtd, 1, NULL)) {
+ err = nand_scan_ident(mtd, 1, NULL);
+ if (err) {
dev_err(&info->pdev->dev,
"scan failed, may be bus-width mismatch\n");
- err = -ENXIO;
goto return_error;
}
@@ -2154,10 +2154,9 @@ static int omap_nand_probe(struct platform_device *pdev)
scan_tail:
/* second phase scan */
- if (nand_scan_tail(mtd)) {
- err = -ENXIO;
+ err = nand_scan_tail(mtd);
+ if (err)
goto return_error;
- }
if (dev->of_node)
mtd_device_register(mtd, NULL, 0);
--
1.9.1
next prev parent reply other threads:[~2016-11-04 10:46 UTC|newest]
Thread overview: 28+ 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 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 ` [PATCH 13/22] mtd: nand: lpc32xx: " Masahiro Yamada
2016-11-06 1:37 ` Vladimir Zapolskiy
2016-11-06 18:27 ` Boris Brezillon
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 ` [PATCH 15/22] mtd: nand: mxc: " Masahiro Yamada
2016-11-04 10:43 ` Masahiro Yamada [this message]
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-06 22:55 ` [PATCH 00/22] mtd: nand: return error code of nand_scan(_ident,_tail) " 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-17-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-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).