From 135cc6960675e5fc32098decadb2eb4e4d7811cd Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 2 Jun 2011 18:00:27 +0400
Subject: [PATCH] --- yaml --- r: 274839 b: refs/heads/master c:
 58171cb1422ed72192cde5573f26e6bd3c5c98f0 h: refs/heads/master i:   274837:
 761c7e2fde71138496de96dea5fb45d33eeef620   274835:
 f97bea9c6236690ae57afbabbd8db3cbc3933306   274831:
 e7595206e94b2903fac5054fd952339201cfa762 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/mtd/nand/bcm_umi_nand.c | 19 ++-----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index bbc229605b23..0f0e686d5323 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef5d79f1e15ded65af7a75fc464d5dd246a912c7
+refs/heads/master: 58171cb1422ed72192cde5573f26e6bd3c5c98f0
diff --git a/trunk/drivers/mtd/nand/bcm_umi_nand.c b/trunk/drivers/mtd/nand/bcm_umi_nand.c
index b1b7b16a843b..a8ae89865a86 100644
--- a/trunk/drivers/mtd/nand/bcm_umi_nand.c
+++ b/trunk/drivers/mtd/nand/bcm_umi_nand.c
@@ -489,23 +489,8 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
 	}
 
 	/* Register the partitions */
-	{
-		int nr_partitions;
-		struct mtd_partition *partition_info;
-
-		board_mtd->name = "bcm_umi-nand";
-		nr_partitions = parse_mtd_partitions(board_mtd, NULL,
-						     &partition_info, 0);
-
-		if (nr_partitions <= 0) {
-			printk(KERN_ERR "BCM UMI NAND: Too few partitions - %d\n",
-			       nr_partitions);
-			iounmap(bcm_umi_io_base);
-			kfree(board_mtd);
-			return -EIO;
-		}
-		mtd_device_register(board_mtd, partition_info, nr_partitions);
-	}
+	board_mtd->name = "bcm_umi-nand";
+	mtd_device_parse_register(board_mtd, NULL, 0, NULL, 0);
 
 	/* Return happy */
 	return 0;