Merge tag 'md/4.5' of git://neil.brown.name/md

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

diff --git a/drivers/mtd/ar7part.c b/drivers/mtd/ar7part.c
index 7c9172ad26210e1d25c9506889e0cbb54212dbfe..90575deff0ae5d3c699ba65558c69650cc1d652a 100644 (file)
--- a/drivers/mtd/ar7part.c
+++ b/drivers/mtd/ar7part.c
@@ -43,7 +43,7 @@ struct ar7_bin_rec {
 };
 
 static int create_mtd_partitions(struct mtd_info *master,
-                                struct mtd_partition **pparts,
+                                const struct mtd_partition **pparts,
                                 struct mtd_part_parser_data *data)
 {
        struct ar7_bin_rec header;
@@ -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 <nbd@openwrt.org>, "