Function register_mtd_parser always returned 0 (at least since v3.3)
before being changed to return void in v3.14-rc1~65^2~93 (mtd: make
register_mtd_parser return void), so it's not needed to check the
return value of this function. Also add __init flag to caller.
This fix compile errors in 3.14 kernel like:
drivers/mtd/mtdsplit_seama.c: In function 'mtdsplit_seama_init':
drivers/mtd/mtdsplit_seama.c:99:2: error: void value not ignored as it ought to be
return register_mtd_parser(&mtdsplit_seama_parser);
^
Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
SVN-Revision: 40731
.type = MTD_PARSER_TYPE_FIRMWARE,
};
.type = MTD_PARSER_TYPE_FIRMWARE,
};
-static int
-mtdsplit_lzma_init(void)
+static int __init mtdsplit_lzma_init(void)
- return register_mtd_parser(&mtdsplit_lzma_parser);
+ register_mtd_parser(&mtdsplit_lzma_parser);
+
+ return 0;
}
subsys_initcall(mtdsplit_lzma_init);
}
subsys_initcall(mtdsplit_lzma_init);
.type = MTD_PARSER_TYPE_FIRMWARE,
};
.type = MTD_PARSER_TYPE_FIRMWARE,
};
-static int
-mtdsplit_seama_init(void)
+static int __init mtdsplit_seama_init(void)
- return register_mtd_parser(&mtdsplit_seama_parser);
+ register_mtd_parser(&mtdsplit_seama_parser);
+
+ return 0;
}
subsys_initcall(mtdsplit_seama_init);
}
subsys_initcall(mtdsplit_seama_init);
.type = MTD_PARSER_TYPE_ROOTFS,
};
.type = MTD_PARSER_TYPE_ROOTFS,
};
-static int
-mtdsplit_squashfs_init(void)
+static int __init mtdsplit_squashfs_init(void)
- return register_mtd_parser(&mtdsplit_squashfs_parser);
+ register_mtd_parser(&mtdsplit_squashfs_parser);
+
+ return 0;
}
subsys_initcall(mtdsplit_squashfs_init);
}
subsys_initcall(mtdsplit_squashfs_init);
.type = MTD_PARSER_TYPE_FIRMWARE,
};
.type = MTD_PARSER_TYPE_FIRMWARE,
};
-static int mtdsplit_uimage_init(void)
+static int __init mtdsplit_uimage_init(void)
- int ret;
-
- ret = register_mtd_parser(&uimage_generic_parser);
- if (ret)
- return ret;
-
- ret = register_mtd_parser(&uimage_netgear_parser);
- if (ret)
- goto err_unregister_generic;
+ register_mtd_parser(&uimage_generic_parser);
+ register_mtd_parser(&uimage_netgear_parser);
-
-err_unregister_generic:
- deregister_mtd_parser(&uimage_generic_parser);
- return ret;
-module_init(mtdsplit_uimage_init);
\ No newline at end of file
+module_init(mtdsplit_uimage_init);
static int __init myloader_mtd_parser_init(void)
{
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)
}
static void __exit myloader_mtd_parser_exit(void)