ar71xx: backport support for Netgear WPN824N

[15.05/openwrt.git] / target / linux / generic / files / drivers / mtd / myloader.c

diff --git a/target/linux/generic/files/drivers/mtd/myloader.c b/target/linux/generic/files/drivers/mtd/myloader.c
index a13752d..cd57369 100644 (file)
--- a/target/linux/generic/files/drivers/mtd/myloader.c
+++ b/target/linux/generic/files/drivers/mtd/myloader.c
@@ -32,15 +32,9 @@ struct part_data {
        char names[MYLO_MAX_PARTITIONS][PART_NAME_LEN];
 };
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
 static int myloader_parse_partitions(struct mtd_info *master,
                                     struct mtd_partition **pparts,
                                     struct mtd_part_parser_data *data)
-#else
-static int myloader_parse_partitions(struct mtd_info *master,
-                                    struct mtd_partition **pparts,
-                                    unsigned long origin)
-#endif
 {
        struct part_data *buf;
        struct mylo_partition_table *tab;
@@ -72,8 +66,8 @@ static int myloader_parse_partitions(struct mtd_info *master,
                printk(KERN_DEBUG "%s: searching for MyLoader partition table"
                                " at offset 0x%lx\n", master->name, offset);
 
-               ret = master->read(master, offset, sizeof(*buf), &retlen,
-                                       (void *)buf);
+               ret = mtd_read(master, offset, sizeof(*buf), &retlen,
+                              (void *)buf);
                if (ret)
                        goto out_free_buf;
 
@@ -170,7 +164,9 @@ static struct mtd_part_parser myloader_mtd_parser = {
 
 static int __init myloader_mtd_parser_init(void)
 {
-       return register_mtd_parser(&myloader_mtd_parser);
+       register_mtd_parser(&myloader_mtd_parser);
+
+       return 0;
 }
 
 static void __exit myloader_mtd_parser_exit(void)