From a4cbcf2838ff518e5f04b9d59de221d04fb704aa Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 2 Jun 2011 18:00:41 +0400 Subject: [PATCH] --- yaml --- r: 274847 b: refs/heads/master c: 90ee1fb3ac918362402a06d0f71545111f374980 h: refs/heads/master i: 274845: b90437f9541d3dce6ef64e188256846dfe764d68 274843: 501c7a0db5d7adb38288fd284fe379fcc066f6ad 274839: 135cc6960675e5fc32098decadb2eb4e4d7811cd 274831: e7595206e94b2903fac5054fd952339201cfa762 274815: 151db1354bbc86308ea678831cddc39e02d2a7c2 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/jz4740_nand.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a38a41777ec2..3c1d83993b9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4571c1396260d3f235d987f4acdadfba820f57bf +refs/heads/master: 90ee1fb3ac918362402a06d0f71545111f374980 diff --git a/trunk/drivers/mtd/nand/jz4740_nand.c b/trunk/drivers/mtd/nand/jz4740_nand.c index 920719cbdb55..e2664073a89b 100644 --- a/trunk/drivers/mtd/nand/jz4740_nand.c +++ b/trunk/drivers/mtd/nand/jz4740_nand.c @@ -295,8 +295,6 @@ static int __devinit jz_nand_probe(struct platform_device *pdev) struct nand_chip *chip; struct mtd_info *mtd; struct jz_nand_platform_data *pdata = pdev->dev.platform_data; - struct mtd_partition *partition_info; - int num_partitions = 0; nand = kzalloc(sizeof(*nand), GFP_KERNEL); if (!nand) { @@ -369,12 +367,9 @@ static int __devinit jz_nand_probe(struct platform_device *pdev) goto err_gpio_free; } - num_partitions = parse_mtd_partitions(mtd, NULL, &partition_info, 0); - if (num_partitions <= 0 && pdata) { - num_partitions = pdata->num_partitions; - partition_info = pdata->partitions; - } - ret = mtd_device_register(mtd, partition_info, num_partitions); + ret = mtd_device_parse_register(mtd, NULL, 0, + pdata ? pdata->partitions : NULL, + pdata ? pdata->num_partitions : 0); if (ret) { dev_err(&pdev->dev, "Failed to add mtd device\n");