mtd: partitions: add module_mtd_part_parser() helper
PATCH 1/2 mtd: partitions: add module_mtd_part_parser() helper
This can help eliminate some boilerplate by generating the module_init() and module_exit() functions, and by automatically assigning the module owner.
Signed-off-by Brian Norris <[email protected]>
--- drivers/mtd/mtdpart.c | 8 ++++++-- include/linux/mtd/partitions.h | 14 +++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-)
drivers/mtd/mtdpart.c +6 -2
@@ -704,13 +704,17 @@ static struct mtd_part_parser *get_partition_parser(const char *name)#define put_partition_parser (p) do { module_put((p)->owner); } while (0) -void register_mtd_parser (struct mtd_part_parser *p) +int __register_mtd_parser (struct mtd_part_parser *p,struct module *owner) { + p->owner = owner; +spin_lock (&part_parser_lock);list_add (&p->list, &part_parsers);spin_unlock (&part_parser_lock); + +return 0 ; } -EXPORT_SYMBOL_GPL (register_mtd_parser); +EXPORT_SYMBOL_GPL (__register_mtd_parser);void deregister_mtd_parser (struct mtd_part_parser *p) {
include/linux/mtd/partitions.h +13 -1
@@ -74,9 +74,21 @@ struct mtd_part_parser { struct mtd_part_parser_data *); }; -extern void register_mtd_parser (struct mtd_part_parser *parser); +extern int __register_mtd_parser (struct mtd_part_parser *parser, +struct module *owner); +#define register_mtd_parser (parser) __register_mtd_parser(parser, THIS_MODULE) +extern void deregister_mtd_parser (struct mtd_part_parser *parser); +/* +* module_mtd_part_parser() - Helper macro for MTD partition parsers that don't +* do anything special in module init/exit. Each driver may only use this macro +* once, and calling it replaces module_init() and module_exit(). +*/ +#define module_mtd_part_parser (__mtd_part_parser) \ + module_driver(__mtd_part_parser, register_mtd_parser, \ + deregister_mtd_parser) +int mtd_is_partition (const struct mtd_info *mtd);int mtd_add_partition (struct mtd_info *master,const char *name,long long offset,long long length);
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
PATCH 2/2 mtd: kill off MTD partition parser boilerplate
Most parsers can be handled with our new boilerplate-reducing macro. There are a few that can't be (cmdlineparts and ofpart).
Also kill off the owner assignments, since register_mtd_parser() now takes care of that.
Signed-off-by Brian Norris <[email protected]>
--- drivers/mtd/afs.c | 17 +---------------- drivers/mtd/ar7part.c | 16 +--------------- drivers/mtd/bcm47xxpart.c | 16 +--------------- drivers/mtd/bcm63xxpart.c | 16 +--------------- drivers/mtd/cmdlinepart.c | 1 - drivers/mtd/ofpart.c | 2 -- drivers/mtd/redboot.c | 17 +---------------- 7 files changed, 5 insertions(+), 80 deletions(-)
drivers/mtd/afs.c +1 -16
@@ -256,25 +256,10 @@ static int parse_afs_partitions(struct mtd_info *mtd, }static struct mtd_part_parser afs_parser = { - .owner =THIS_MODULE , .parse_fn = parse_afs_partitions, .name ="afs" , }; - -static int __init afs_parser_init (void ) -{ -register_mtd_parser (&afs_parser); -return 0 ; -} - -static void __exit afs_parser_exit(void) -{ -deregister_mtd_parser (&afs_parser); -} - -module_init (afs_parser_init); -module_exit (afs_parser_exit); - +module_mtd_part_parser (afs_parser);MODULE_AUTHOR ("ARM Ltd" );MODULE_DESCRIPTION ("ARM Firmware Suite partition parser" );
drivers/mtd/ar7part.c +1 -15
@@ -132,24 +132,10 @@ static int create_mtd_partitions(struct mtd_info *master, }static struct mtd_part_parser ar7_parser = { - .owner =THIS_MODULE , .parse_fn = create_mtd_partitions, .name ="ar7part" , }; - -static int __init ar7_parser_init (void ) -{ -register_mtd_parser (&ar7_parser); -return 0 ; -} - -static void __exit ar7_parser_exit(void) -{ -deregister_mtd_parser (&ar7_parser); -} - -module_init (ar7_parser_init); -module_exit (ar7_parser_exit); +module_mtd_part_parser (ar7_parser);MODULE_LICENSE ("GPL" ); MODULE_AUTHOR( "Felix Fietkau <[email protected]>, "
drivers/mtd/bcm47xxpart.c +1 -15
@@ -313,24 +313,10 @@ static int bcm47xxpart_parse(struct mtd_info *master, };static struct mtd_part_parser bcm47xxpart_mtd_parser = { - .owner =THIS_MODULE , .parse_fn = bcm47xxpart_parse, .name ="bcm47xxpart" , }; - -static int __init bcm47xxpart_init (void ) -{ -register_mtd_parser (&bcm47xxpart_mtd_parser); -return 0 ; -} - -static void __exit bcm47xxpart_exit(void) -{ -deregister_mtd_parser (&bcm47xxpart_mtd_parser); -} - -module_init (bcm47xxpart_init); -module_exit (bcm47xxpart_exit); +module_mtd_part_parser (bcm47xxpart_mtd_parser);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("MTD partitioning for BCM47XX flash memories" );
drivers/mtd/bcm63xxpart.c +1 -15
@@ -214,24 +214,10 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, };static struct mtd_part_parser bcm63xx_cfe_parser = { - .owner =THIS_MODULE , .parse_fn = bcm63xx_parse_cfe_partitions, .name ="bcm63xxpart" , }; - -static int __init bcm63xx_cfe_parser_init (void ) -{ -register_mtd_parser (&bcm63xx_cfe_parser); -return 0 ; -} - -static void __exit bcm63xx_cfe_parser_exit(void) -{ -deregister_mtd_parser (&bcm63xx_cfe_parser); -} - -module_init (bcm63xx_cfe_parser_init); -module_exit (bcm63xx_cfe_parser_exit); +module_mtd_part_parser (bcm63xx_cfe_parser);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Daniel Dickinson <[email protected]>" );
drivers/mtd/cmdlinepart.c +0 -1
@@ -382,7 +382,6 @@ static int __init mtdpart_setup(char *s)__setup ("mtdparts=" , mtdpart_setup);static struct mtd_part_parser cmdline_parser = { - .owner =THIS_MODULE , .parse_fn = parse_cmdline_partitions, .name ="cmdlinepart" , };
drivers/mtd/ofpart.c +0 -2
@@ -131,7 +131,6 @@ ofpart_none: }static struct mtd_part_parser ofpart_parser = { - .owner =THIS_MODULE , .parse_fn = parse_ofpart_partitions, .name ="ofpart" , };
@@ -191,7 +190,6 @@ static int parse_ofoldpart_partitions(struct mtd_info *master, }static struct mtd_part_parser ofoldpart_parser = { - .owner =THIS_MODULE , .parse_fn = parse_ofoldpart_partitions, .name ="ofoldpart" , };
drivers/mtd/redboot.c +1 -16
@@ -290,28 +290,13 @@ static int parse_redboot_partitions(struct mtd_info *master, }static struct mtd_part_parser redboot_parser = { - .owner =THIS_MODULE , .parse_fn = parse_redboot_partitions, .name ="RedBoot" , }; +module_mtd_part_parser (redboot_parser);/* mtd parsers will request the module by parser name */ MODULE_ALIAS ("RedBoot" ); - -static int __init redboot_parser_init (void ) -{ -register_mtd_parser (&redboot_parser); -return 0 ; -} - -static void __exit redboot_parser_exit(void) -{ -deregister_mtd_parser (&redboot_parser); -} - -module_init (redboot_parser_init); -module_exit (redboot_parser_exit); -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("David Woodhouse <[email protected]>" );MODULE_DESCRIPTION ("Parsing code for RedBoot Flash Image System (FIS) tables" );
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
Brian Norris
AppliedQuoted 5 lines · Brian Norris
This can help eliminate some boilerplate by generating the
module_init()andmodule_exit()functions, and by automatically assigning the module owner.Signed-off-by Brian Norris <[email protected]>
Applied both to l2-mtd.git