diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-05-23 07:30:20 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-20 21:59:23 +0200 |
| commit | 01f9c7240a900d5676a8496496f2974dd36996b1 (patch) | |
| tree | aa6cb77331f34fab5f16ac5f88f83ed0ca3ba7f0 | |
| parent | dt-bindings: mtd: make partitions doc a bit more generic (diff) | |
| download | linux-01f9c7240a900d5676a8496496f2974dd36996b1.tar.xz linux-01f9c7240a900d5676a8496496f2974dd36996b1.zip | |
mtd: partitions: factor out code calling parser
This code is going to be reused for parsers matched using OF so let's
factor it out to make this easier.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Brian Norris <computersforpeace@gmail.com>
| -rw-r--r-- | drivers/mtd/mtdpart.c | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 2e152e53ace0..7ececd3d7799 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -807,6 +807,27 @@ static const char * const default_mtd_part_types[] = { NULL }; +static int mtd_part_do_parse(struct mtd_part_parser *parser, + struct mtd_info *master, + struct mtd_partitions *pparts, + struct mtd_part_parser_data *data) +{ + int ret; + + ret = (*parser->parse_fn)(master, &pparts->parts, data); + pr_debug("%s: parser %s: %i\n", master->name, parser->name, ret); + if (ret <= 0) + return ret; + + pr_notice("%d %s partitions found on MTD device %s\n", ret, + parser->name, master->name); + + pparts->nr_parts = ret; + pparts->parser = parser; + + return ret; +} + /** * parse_mtd_partitions - parse MTD partitions * @master: the master partition (describes whole MTD device) @@ -847,16 +868,10 @@ int parse_mtd_partitions(struct mtd_info *master, const char *const *types, parser ? parser->name : NULL); if (!parser) continue; - ret = (*parser->parse_fn)(master, &pparts->parts, data); - pr_debug("%s: parser %s: %i\n", - master->name, parser->name, ret); - if (ret > 0) { - printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n", - ret, parser->name, master->name); - pparts->nr_parts = ret; - pparts->parser = parser; + ret = mtd_part_do_parse(parser, master, pparts, data); + /* Found partitions! */ + if (ret > 0) return 0; - } mtd_part_parser_put(parser); /* * Stash the first error we see; only report it if no parser |