From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 4 Nov 2016 10:43:10 +0000 (+0900)
Subject: mtd: nand: socrates: use nand_scan() for nand_scan_ident/tail() combo
X-Git-Tag: v5.15~12218^2~4^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83f48f80de8a03c053ff0cac1521c1eaeaa107f2;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index 888fd31..72369bd 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)