From 501c7a0db5d7adb38288fd284fe379fcc066f6ad Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 2 Jun 2011 18:00:32 +0400
Subject: [PATCH] --- yaml --- r: 274843 b: refs/heads/master c:
 5b55b1eb21a5aba9c6cf4e0325ac9e4dffa89435 h: refs/heads/master i:   274841:
 7d9cf1474e4cdad82fda203acb32eb98c03c9cc5   274839:
 135cc6960675e5fc32098decadb2eb4e4d7811cd v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/mtd/nand/davinci_nand.c | 25 ++-----------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 1f1952c9a179..329cdb170e19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbd86c9c33c8d1549cbad5077c5dbaeec8a5cae8
+refs/heads/master: 5b55b1eb21a5aba9c6cf4e0325ac9e4dffa89435
diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c
index 70c92a527f6b..c153e1f77f90 100644
--- a/trunk/drivers/mtd/nand/davinci_nand.c
+++ b/trunk/drivers/mtd/nand/davinci_nand.c
@@ -57,7 +57,6 @@ struct davinci_nand_info {
 
 	struct device		*dev;
 	struct clk		*clk;
-	bool			partitioned;
 
 	bool			is_readmode;
 
@@ -530,8 +529,6 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
 	int				ret;
 	uint32_t			val;
 	nand_ecc_modes_t		ecc_mode;
-	struct mtd_partition		*mtd_parts = NULL;
-	int				mtd_parts_nb = 0;
 
 	/* insist on board-specific configuration */
 	if (!pdata)
@@ -753,26 +750,8 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
 	if (ret < 0)
 		goto err_scan;
 
-	mtd_parts_nb = parse_mtd_partitions(&info->mtd, NULL, &mtd_parts, 0);
-
-	if (mtd_parts_nb <= 0) {
-		mtd_parts = pdata->parts;
-		mtd_parts_nb = pdata->nr_parts;
-	}
-
-	/* Register any partitions */
-	if (mtd_parts_nb > 0) {
-		ret = mtd_device_register(&info->mtd, mtd_parts,
-					  mtd_parts_nb);
-		if (ret == 0)
-			info->partitioned = true;
-	}
-
-	/* If there's no partition info, just package the whole chip
-	 * as a single MTD device.
-	 */
-	if (!info->partitioned)
-		ret = mtd_device_register(&info->mtd, NULL, 0) ? -ENODEV : 0;
+	ret = mtd_device_parse_register(&info->mtd, NULL, 0,
+			pdata->parts, pdata->nr_parts);
 
 	if (ret < 0)
 		goto err_scan;