Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[deliverable/linux.git] / drivers / mtd / bcm63xxpart.c

diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c
index 0aa66c378c9f93c14f6e794394cd0a9b39c2cf37..cec3188a170d6a504aad659c45cdd9613002c394 100644 (file)
--- a/drivers/mtd/bcm63xxpart.c
+++ b/drivers/mtd/bcm63xxpart.c
@@ -66,7 +66,7 @@ static int bcm63xx_detect_cfe(struct mtd_info *master)
 }
 
 static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
-                                       struct mtd_partition **pparts,
+                                       const struct mtd_partition **pparts,
                                        struct mtd_part_parser_data *data)
 {
        /* CFE, NVRAM and global Linux are always present */
@@ -212,24 +212,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 <openwrt@cshore.neomailbox.net>");