| Message ID | 1449271518-118900-4-git-send-email-computersforpeace@gmail.com |
|---|---|
| State | Accepted |
| Commit | 5531ae4818fb04b9a30f87099f44595c1786f518 |
| Headers | show |
On Fri, 4 Dec 2015 15:25:15 -0800 Brian Norris <computersforpeace@gmail.com> wrote: > We're going to reuse put_partition_parser(), so let's fix up the prefix > naming a bit, to hopefully be more consistent. Also make convert to a > true C function instead of a macro. > > Signed-off-by: Brian Norris <computersforpeace@gmail.com> > --- > v2: keep mtd_part_parser_put() in the *.c file instead of the header, since > we'll only use it in a wrapper now instead of exporting it directly Don't know if you forgot my R-b tag or if you dropped it on purpose because of this change, but it still applies here. Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > drivers/mtd/mtdpart.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c > index 1fa3ca95d9c1..c6fd4b24c822 100644 > --- a/drivers/mtd/mtdpart.c > +++ b/drivers/mtd/mtdpart.c > @@ -684,7 +684,7 @@ int add_mtd_partitions(struct mtd_info *master, > static DEFINE_SPINLOCK(part_parser_lock); > static LIST_HEAD(part_parsers); > > -static struct mtd_part_parser *get_partition_parser(const char *name) > +static struct mtd_part_parser *mtd_part_parser_get(const char *name) > { > struct mtd_part_parser *p, *ret = NULL; > > @@ -701,7 +701,10 @@ static struct mtd_part_parser *get_partition_parser(const char *name) > return ret; > } > > -#define put_partition_parser(p) do { module_put((p)->owner); } while (0) > +static inline void mtd_part_parser_put(const struct mtd_part_parser *p) > +{ > + module_put(p->owner); > +} > > int __register_mtd_parser(struct mtd_part_parser *p, struct module *owner) > { > @@ -765,9 +768,9 @@ 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 = get_partition_parser(*types); > + parser = mtd_part_parser_get(*types); > if (!parser && !request_module("%s", *types)) > - parser = get_partition_parser(*types); > + parser = mtd_part_parser_get(*types); > pr_debug("%s: got parser %s\n", master->name, > parser ? parser->name : NULL); > if (!parser) > @@ -775,7 +778,7 @@ int parse_mtd_partitions(struct mtd_info *master, const char *const *types, > ret = (*parser->parse_fn)(master, pparts, data); > pr_debug("%s: parser %s: %i\n", > master->name, parser->name, ret); > - put_partition_parser(parser); > + mtd_part_parser_put(parser); > if (ret > 0) { > printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n", > ret, parser->name, master->name);
On Sat, Dec 05, 2015 at 01:00:02AM +0100, Boris Brezillon wrote: > On Fri, 4 Dec 2015 15:25:15 -0800 > Brian Norris <computersforpeace@gmail.com> wrote: > > We're going to reuse put_partition_parser(), so let's fix up the prefix > > naming a bit, to hopefully be more consistent. Also make convert to a > > true C function instead of a macro. > > > > Signed-off-by: Brian Norris <computersforpeace@gmail.com> > > --- > > v2: keep mtd_part_parser_put() in the *.c file instead of the header, since > > we'll only use it in a wrapper now instead of exporting it directly > > Don't know if you forgot my R-b tag or if you dropped it on purpose > because of this change, but it still applies here. Was intentional, for that reason. > Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> Thanks!
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 1fa3ca95d9c1..c6fd4b24c822 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -684,7 +684,7 @@ int add_mtd_partitions(struct mtd_info *master, static DEFINE_SPINLOCK(part_parser_lock); static LIST_HEAD(part_parsers); -static struct mtd_part_parser *get_partition_parser(const char *name) +static struct mtd_part_parser *mtd_part_parser_get(const char *name) { struct mtd_part_parser *p, *ret = NULL; @@ -701,7 +701,10 @@ static struct mtd_part_parser *get_partition_parser(const char *name) return ret; } -#define put_partition_parser(p) do { module_put((p)->owner); } while (0) +static inline void mtd_part_parser_put(const struct mtd_part_parser *p) +{ + module_put(p->owner); +} int __register_mtd_parser(struct mtd_part_parser *p, struct module *owner) { @@ -765,9 +768,9 @@ 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 = get_partition_parser(*types); + parser = mtd_part_parser_get(*types); if (!parser && !request_module("%s", *types)) - parser = get_partition_parser(*types); + parser = mtd_part_parser_get(*types); pr_debug("%s: got parser %s\n", master->name, parser ? parser->name : NULL); if (!parser) @@ -775,7 +778,7 @@ int parse_mtd_partitions(struct mtd_info *master, const char *const *types, ret = (*parser->parse_fn)(master, pparts, data); pr_debug("%s: parser %s: %i\n", master->name, parser->name, ret); - put_partition_parser(parser); + mtd_part_parser_put(parser); if (ret > 0) { printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n", ret, parser->name, master->name);
We're going to reuse put_partition_parser(), so let's fix up the prefix naming a bit, to hopefully be more consistent. Also make convert to a true C function instead of a macro. Signed-off-by: Brian Norris <computersforpeace@gmail.com> --- v2: keep mtd_part_parser_put() in the *.c file instead of the header, since we'll only use it in a wrapper now instead of exporting it directly drivers/mtd/mtdpart.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)