diff options
| author | Dmitry Eremin-Solenikov | 2011-06-02 15:59:41 +0200 |
|---|---|---|
| committer | Artem Bityutskiy | 2011-09-11 14:02:06 +0200 |
| commit | 534e4928ad672a319c29b9f0c0593ad16766de53 (patch) | |
| tree | 21eb54a31d4effb7291e089a072c0cb1bf728c94 /drivers/mtd/maps | |
| parent | mtd: dc21285.c: use mtd_device_parse_register (diff) | |
| download | kernel-qcow2-linux-534e4928ad672a319c29b9f0c0593ad16766de53.tar.gz kernel-qcow2-linux-534e4928ad672a319c29b9f0c0593ad16766de53.tar.xz kernel-qcow2-linux-534e4928ad672a319c29b9f0c0593ad16766de53.zip | |
mtd: gpio-addr-flash.c: use mtd_device_parse_register
Replace custom invocations of parse_mtd_partitions and mtd_device_register
with common mtd_device_parse_register call. This would bring: standard
handling of all errors, fallback to default partitions, etc.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/maps')
| -rw-r--r-- | drivers/mtd/maps/gpio-addr-flash.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c index 7568c5f8b8ae..1ec66f031c51 100644 --- a/drivers/mtd/maps/gpio-addr-flash.c +++ b/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; } |