Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

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

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index c0720c1ee4c9607d0887e7b4caacecdac96088af..8282f47bcf5d374e03d343453d62ee0bc4851785 100644 (file)
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -82,7 +82,7 @@ out_default:
 }
 
 static int bcm47xxpart_parse(struct mtd_info *master,
-                            struct mtd_partition **pparts,
+                            const struct mtd_partition **pparts,
                             struct mtd_part_parser_data *data)
 {
        struct mtd_partition *parts;
@@ -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");