Commit 83f48f80 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Boris Brezillon
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent c7518302

drivers/mtd/nand/socrates_nand.c

+2 −10
Original line number Diff line number Diff line
@@ -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)