kernel/generic: modify mtd related patches for 3.14

[15.05/openwrt.git] / 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 94b22f6..de55297 100644 (file)
--- 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);