Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752920AbbLEFUm (ORCPT ); Sat, 5 Dec 2015 00:20:42 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:36637 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072AbbLEFTm (ORCPT ); Sat, 5 Dec 2015 00:19:42 -0500 From: Brian Norris To: Cc: , Boris Brezillon , Linus Walleij , Geert Uytterhoeven , Simon Arlott , Jason Gunthorpe , Jonas Gorski , Brian Norris , , , Rob Herring , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Hauke Mehrtens , Arnd Bergmann Subject: [RFC PATCH 5/7] mtd: partitions: factor out "match by name" handling Date: Fri, 4 Dec 2015 21:19:21 -0800 Message-Id: <1449292763-129421-6-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1449292763-129421-1-git-send-email-computersforpeace@gmail.com> References: <1449292763-129421-1-git-send-email-computersforpeace@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3814 Lines: 127 This code structure is going to be imitated for a match-by-device-node implementation, so let's factor out a few functions to make this easier. Signed-off-by: Brian Norris --- drivers/mtd/mtdpart.c | 67 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 10bf304027dd..b3100742ddf6 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -687,23 +687,47 @@ int add_mtd_partitions(struct mtd_info *master, static DEFINE_SPINLOCK(part_parser_lock); static LIST_HEAD(part_parsers); -static struct mtd_part_parser *mtd_part_parser_get(const char *name) +static bool mtd_part_parser_match_name(struct mtd_part_parser *p, + const char *name) +{ + return !strcmp(p->name, name); +} + +static struct mtd_part_parser *__mtd_part_parser_get_by_name(const char *name) { struct mtd_part_parser *p, *ret = NULL; spin_lock(&part_parser_lock); - list_for_each_entry(p, &part_parsers, list) - if (!strcmp(p->name, name) && try_module_get(p->owner)) { + list_for_each_entry(p, &part_parsers, list) { + if (mtd_part_parser_match_name(p, name) && + try_module_get(p->owner)) { ret = p; break; } + } spin_unlock(&part_parser_lock); return ret; } +static struct mtd_part_parser *mtd_part_parser_get_by_name(const char *name) +{ + struct mtd_part_parser *p; + + /* Get parser, if already loaded */ + p = __mtd_part_parser_get_by_name(name); + if (p) + return p; + + if (request_module("%s", name)) + return NULL; + + /* Try again */ + return __mtd_part_parser_get_by_name(name); +} + static inline void mtd_part_parser_put(const struct mtd_part_parser *p) { module_put(p->owner); @@ -752,6 +776,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) @@ -785,23 +830,15 @@ int parse_mtd_partitions(struct mtd_info *master, const char *const *types, for ( ; *types; types++) { pr_debug("%s: parsing partitions %s\n", master->name, *types); - parser = mtd_part_parser_get(*types); - if (!parser && !request_module("%s", *types)) - parser = mtd_part_parser_get(*types); + parser = mtd_part_parser_get_by_name(*types); pr_debug("%s: got parser %s\n", master->name, 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 -- 2.6.0.rc2.230.g3dd15c0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/