diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-11-04 11:43:10 +0100 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-11-07 14:48:53 +0100 |
| commit | 83f48f80de8a03c053ff0cac1521c1eaeaa107f2 (patch) | |
| tree | ffb98c39b9cf76cba4eb752aab57b6a740982d41 /drivers/mtd | |
| parent | mtd: nand: nandsim: remove unneeded checks for nand_scan_ident/tail() (diff) | |
| download | linux-83f48f80de8a03c053ff0cac1521c1eaeaa107f2.tar.xz linux-83f48f80de8a03c053ff0cac1521c1eaeaa107f2.zip | |
mtd: nand: socrates: use nand_scan() for nand_scan_ident/tail() combo
For this driver, there is nothing between nand_scan_ident() and
nand_scan_tail(). They can be merged into nand_scan().
Also, nand_scan() 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>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/socrates_nand.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c index 888fd314c62a..72369bd079af 100644 --- a/drivers/mtd/nand/socrates_nand.c +++ b/drivers/mtd/nand/socrates_nand.c @@ -187,17 +187,9 @@ static int socrates_nand_probe(struct platform_device *ofdev) dev_set_drvdata(&ofdev->dev, host); - /* first scan to find the device and get the page size */ - if (nand_scan_ident(mtd, 1, NULL)) { - res = -ENXIO; + res = nand_scan(mtd, 1); + if (res) goto out; - } - - /* second phase scan */ - if (nand_scan_tail(mtd)) { - res = -ENXIO; - goto out; - } res = mtd_device_register(mtd, NULL, 0); if (!res) |