kernel: drop unneeded LINUX_VERSION_CODE checks
authorRafał Miłecki <rafal@milecki.pl>
Thu, 13 Dec 2018 15:59:21 +0000 (16:59 +0100)
committerRafał Miłecki <rafal@milecki.pl>
Thu, 13 Dec 2018 15:59:21 +0000 (16:59 +0100)
All those parsers are used by 4.14 targets. They don't need that
backward compatibility code.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_jimage.c
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_minor.c
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_seama.c
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_trx.c

index 5c6c5b0..2b87fe4 100644 (file)
@@ -19,7 +19,6 @@
 #include <linux/vmalloc.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/version.h>
 #include <linux/byteorder/generic.h>
 
 #include "mtdsplit.h"
@@ -257,19 +256,15 @@ mtdsplit_jimage_parse_generic(struct mtd_info *master,
                                      jimage_verify_default);
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
 static const struct of_device_id mtdsplit_jimage_of_match_table[] = {
        { .compatible = "amit,jimage" },
        {},
 };
-#endif
 
 static struct mtd_part_parser jimage_generic_parser = {
        .owner = THIS_MODULE,
        .name = "jimage-fw",
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
        .of_match_table = mtdsplit_jimage_of_match_table,
-#endif
        .parse_fn = mtdsplit_jimage_parse_generic,
        .type = MTD_PARSER_TYPE_FIRMWARE,
 };
index d709a13..650ac6c 100644 (file)
@@ -100,22 +100,16 @@ static int mtdsplit_parse_minor(struct mtd_info *master,
        return MINOR_NR_PARTS;
 }
 
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
 static const struct of_device_id mtdsplit_minor_of_match_table[] = {
        { .compatible = "mikrotik,minor" },
        {},
 };
 MODULE_DEVICE_TABLE(of, mtdsplit_minor_of_match_table);
-#endif
 
 static struct mtd_part_parser mtdsplit_minor_parser = {
        .owner = THIS_MODULE,
        .name = "minor-fw",
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
        .of_match_table = mtdsplit_minor_of_match_table,
-#endif
        .parse_fn = mtdsplit_parse_minor,
        .type = MTD_PARSER_TYPE_FIRMWARE,
 };
index 2d70f9b..815c28b 100644 (file)
@@ -93,22 +93,16 @@ static int mtdsplit_parse_seama(struct mtd_info *master,
        return SEAMA_NR_PARTS;
 }
 
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
 static const struct of_device_id mtdsplit_seama_of_match_table[] = {
        { .compatible = "seama" },
        {},
 };
 MODULE_DEVICE_TABLE(of, mtdsplit_seama_of_match_table);
-#endif
 
 static struct mtd_part_parser mtdsplit_seama_parser = {
        .owner = THIS_MODULE,
        .name = "seama-fw",
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
        .of_match_table = mtdsplit_seama_of_match_table,
-#endif
        .parse_fn = mtdsplit_parse_seama,
        .type = MTD_PARSER_TYPE_FIRMWARE,
 };
index ff4a474..a6ae144 100644 (file)
@@ -14,7 +14,6 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/version.h>
 #include <linux/byteorder/generic.h>
 
 #include "mtdsplit.h"
@@ -153,19 +152,15 @@ static int mtdsplit_parse_tplink(struct mtd_info *master,
        return TPLINK_NR_PARTS;
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
 static const struct of_device_id mtdsplit_tplink_of_match_table[] = {
        { .compatible = "tplink,firmware" },
        {},
 };
-#endif
 
 static struct mtd_part_parser mtdsplit_tplink_parser = {
        .owner = THIS_MODULE,
        .name = "tplink-fw",
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
        .of_match_table = mtdsplit_tplink_of_match_table,
-#endif
        .parse_fn = mtdsplit_parse_tplink,
        .type = MTD_PARSER_TYPE_FIRMWARE,
 };
index d5e3372..4f6c467 100644 (file)
@@ -130,22 +130,16 @@ err:
        return ret;
 }
 
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
 static const struct of_device_id trx_parser_of_match_table[] = {
        { .compatible = "openwrt,trx" },
        {},
 };
 MODULE_DEVICE_TABLE(of, trx_parser_of_match_table);
-#endif
 
 static struct mtd_part_parser trx_parser = {
        .owner = THIS_MODULE,
        .name = "trx-fw",
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
        .of_match_table = trx_parser_of_match_table,
-#endif
        .parse_fn = mtdsplit_parse_trx,
        .type = MTD_PARSER_TYPE_FIRMWARE,
 };