From c09007c1af489f59dcd13c654b58550f5050d433 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 8 May 2014 21:51:36 +0000 Subject: kernel/generic: modify mtd related patches for 3.14 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 SVN-Revision: 40731 --- .../linux/generic/files/drivers/mtd/mtdsplit_uimage.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'target/linux/generic/files/drivers/mtd/mtdsplit_uimage.c') diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit_uimage.c b/target/linux/generic/files/drivers/mtd/mtdsplit_uimage.c index 94b22f67e2..de55297870 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit_uimage.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit_uimage.c @@ -271,23 +271,12 @@ static struct mtd_part_parser uimage_netgear_parser = { .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); return 0; - -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); -- cgit v1.2.3