From e3f665f7a7023183ef5e409436f635f652c90864 Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 2 Jun 2011 18:00:40 +0400
Subject: [PATCH] --- yaml --- r: 274846 b: refs/heads/master c:
 4571c1396260d3f235d987f4acdadfba820f57bf h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/mtd/nand/h1910.c | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 1ef34f92680d..a38a41777ec2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d04eda1430e9a796214bee644b7e05d99cfe613
+refs/heads/master: 4571c1396260d3f235d987f4acdadfba820f57bf
diff --git a/trunk/drivers/mtd/nand/h1910.c b/trunk/drivers/mtd/nand/h1910.c
index 42f9177e36b1..5dc6f0d92f1a 100644
--- a/trunk/drivers/mtd/nand/h1910.c
+++ b/trunk/drivers/mtd/nand/h1910.c
@@ -81,9 +81,6 @@ static int h1910_device_ready(struct mtd_info *mtd)
 static int __init h1910_init(void)
 {
 	struct nand_chip *this;
-	const char *part_type = 0;
-	int mtd_parts_nb = 0;
-	struct mtd_partition *mtd_parts = 0;
 	void __iomem *nandaddr;
 
 	if (!machine_is_h1900())
@@ -136,18 +133,10 @@ static int __init h1910_init(void)
 		iounmap((void *)nandaddr);
 		return -ENXIO;
 	}
-	mtd_parts_nb = parse_mtd_partitions(h1910_nand_mtd, NULL, &mtd_parts, 0);
-	if (mtd_parts_nb > 0)
-		part_type = "command line";
-	else {
-		mtd_parts = partition_info;
-		mtd_parts_nb = NUM_PARTITIONS;
-		part_type = "static";
-	}
 
 	/* Register the partitions */
-	printk(KERN_NOTICE "Using %s partition definition\n", part_type);
-	mtd_device_register(h1910_nand_mtd, mtd_parts, mtd_parts_nb);
+	mtd_device_parse_register(h1910_nand_mtd, NULL, 0,
+			partition_info, NUM_PARTITIONS);
 
 	/* Return happy */
 	return 0;