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