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

---
 [refs]                           |  2 +-
 trunk/drivers/mtd/nand/edb7312.c | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 329cdb170e19..3938517771d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b55b1eb21a5aba9c6cf4e0325ac9e4dffa89435
+refs/heads/master: 6cb03c9cb520186859a034e4e829fb591aea78b6
diff --git a/trunk/drivers/mtd/nand/edb7312.c b/trunk/drivers/mtd/nand/edb7312.c
index 2f9374b38b90..0b1bb91d46a9 100644
--- a/trunk/drivers/mtd/nand/edb7312.c
+++ b/trunk/drivers/mtd/nand/edb7312.c
@@ -104,9 +104,6 @@ static int ep7312_device_ready(struct mtd_info *mtd)
 static int __init ep7312_init(void)
 {
 	struct nand_chip *this;
-	const char *part_type = 0;
-	int mtd_parts_nb = 0;
-	struct mtd_partition *mtd_parts = 0;
 	void __iomem *ep7312_fio_base;
 
 	/* Allocate memory for MTD device structure and private data */
@@ -156,20 +153,10 @@ static int __init ep7312_init(void)
 		return -ENXIO;
 	}
 	ep7312_mtd->name = "edb7312-nand";
-	mtd_parts_nb = parse_mtd_partitions(ep7312_mtd, NULL, &mtd_parts, 0);
-	if (mtd_parts_nb > 0)
-		part_type = "command line";
-	else
-		mtd_parts_nb = 0;
-	if (mtd_parts_nb == 0) {
-		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(ep7312_mtd, mtd_parts, mtd_parts_nb);
+	mtd_device_register(ep7312_mtd, NULL, 0,
+			partition_info, NUM_PARTITIONS);
 
 	/* Return happy */
 	return 0;