From 4b2d9728d8269d43b123c7083cb96c9756c9f53c Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 2 Jun 2011 17:59:41 +0400 Subject: [PATCH] --- yaml --- r: 274823 b: refs/heads/master c: 534e4928ad672a319c29b9f0c0593ad16766de53 h: refs/heads/master i: 274821: 9733b875b09b81f55d7aa3a5802bc30f1f1f302f 274819: 9e77c2f7d702e587751c035c826a6eb2934697ef 274815: 151db1354bbc86308ea678831cddc39e02d2a7c2 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/gpio-addr-flash.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 4b852179aaac..f37905f02353 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d0e9db409909a0259fa005fee81a7c639bd645a +refs/heads/master: 534e4928ad672a319c29b9f0c0593ad16766de53 diff --git a/trunk/drivers/mtd/maps/gpio-addr-flash.c b/trunk/drivers/mtd/maps/gpio-addr-flash.c index 7568c5f8b8ae..1ec66f031c51 100644 --- a/trunk/drivers/mtd/maps/gpio-addr-flash.c +++ b/trunk/drivers/mtd/maps/gpio-addr-flash.c @@ -187,7 +187,6 @@ static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; */ static int __devinit gpio_flash_probe(struct platform_device *pdev) { - int nr_parts; size_t i, arr_size; struct physmap_flash_data *pdata; struct resource *memory; @@ -252,20 +251,9 @@ static int __devinit gpio_flash_probe(struct platform_device *pdev) return -ENXIO; } - nr_parts = parse_mtd_partitions(state->mtd, part_probe_types, - &pdata->parts, 0); - if (nr_parts > 0) { - pr_devinit(KERN_NOTICE PFX "Using commandline partition definition\n"); - kfree(pdata->parts); - } else if (pdata->nr_parts) { - pr_devinit(KERN_NOTICE PFX "Using board partition definition\n"); - nr_parts = pdata->nr_parts; - } else { - pr_devinit(KERN_NOTICE PFX "no partition info available, registering whole flash at once\n"); - nr_parts = 0; - } - mtd_device_register(state->mtd, pdata->parts, nr_parts); + mtd_device_parse_register(state->mtd, part_probe_types, 0, + pdata->parts, pdata->nr_parts); return 0; }