kernel: drop unneeded LINUX_VERSION_CODE checks

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>
v19.07.3_mercusys_ac12_duma
Rafał Miłecki 6 years ago
parent 2abb128f2e
commit 816ae87709

@ -19,7 +19,6 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/version.h>
#include <linux/byteorder/generic.h> #include <linux/byteorder/generic.h>
#include "mtdsplit.h" #include "mtdsplit.h"
@ -257,19 +256,15 @@ mtdsplit_jimage_parse_generic(struct mtd_info *master,
jimage_verify_default); jimage_verify_default);
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
static const struct of_device_id mtdsplit_jimage_of_match_table[] = { static const struct of_device_id mtdsplit_jimage_of_match_table[] = {
{ .compatible = "amit,jimage" }, { .compatible = "amit,jimage" },
{}, {},
}; };
#endif
static struct mtd_part_parser jimage_generic_parser = { static struct mtd_part_parser jimage_generic_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "jimage-fw", .name = "jimage-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = mtdsplit_jimage_of_match_table, .of_match_table = mtdsplit_jimage_of_match_table,
#endif
.parse_fn = mtdsplit_jimage_parse_generic, .parse_fn = mtdsplit_jimage_parse_generic,
.type = MTD_PARSER_TYPE_FIRMWARE, .type = MTD_PARSER_TYPE_FIRMWARE,
}; };

@ -100,22 +100,16 @@ static int mtdsplit_parse_minor(struct mtd_info *master,
return MINOR_NR_PARTS; 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[] = { static const struct of_device_id mtdsplit_minor_of_match_table[] = {
{ .compatible = "mikrotik,minor" }, { .compatible = "mikrotik,minor" },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, mtdsplit_minor_of_match_table); MODULE_DEVICE_TABLE(of, mtdsplit_minor_of_match_table);
#endif
static struct mtd_part_parser mtdsplit_minor_parser = { static struct mtd_part_parser mtdsplit_minor_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "minor-fw", .name = "minor-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = mtdsplit_minor_of_match_table, .of_match_table = mtdsplit_minor_of_match_table,
#endif
.parse_fn = mtdsplit_parse_minor, .parse_fn = mtdsplit_parse_minor,
.type = MTD_PARSER_TYPE_FIRMWARE, .type = MTD_PARSER_TYPE_FIRMWARE,
}; };

@ -93,22 +93,16 @@ static int mtdsplit_parse_seama(struct mtd_info *master,
return SEAMA_NR_PARTS; 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[] = { static const struct of_device_id mtdsplit_seama_of_match_table[] = {
{ .compatible = "seama" }, { .compatible = "seama" },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, mtdsplit_seama_of_match_table); MODULE_DEVICE_TABLE(of, mtdsplit_seama_of_match_table);
#endif
static struct mtd_part_parser mtdsplit_seama_parser = { static struct mtd_part_parser mtdsplit_seama_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "seama-fw", .name = "seama-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = mtdsplit_seama_of_match_table, .of_match_table = mtdsplit_seama_of_match_table,
#endif
.parse_fn = mtdsplit_parse_seama, .parse_fn = mtdsplit_parse_seama,
.type = MTD_PARSER_TYPE_FIRMWARE, .type = MTD_PARSER_TYPE_FIRMWARE,
}; };

@ -14,7 +14,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/version.h>
#include <linux/byteorder/generic.h> #include <linux/byteorder/generic.h>
#include "mtdsplit.h" #include "mtdsplit.h"
@ -153,19 +152,15 @@ static int mtdsplit_parse_tplink(struct mtd_info *master,
return TPLINK_NR_PARTS; return TPLINK_NR_PARTS;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
static const struct of_device_id mtdsplit_tplink_of_match_table[] = { static const struct of_device_id mtdsplit_tplink_of_match_table[] = {
{ .compatible = "tplink,firmware" }, { .compatible = "tplink,firmware" },
{}, {},
}; };
#endif
static struct mtd_part_parser mtdsplit_tplink_parser = { static struct mtd_part_parser mtdsplit_tplink_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "tplink-fw", .name = "tplink-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = mtdsplit_tplink_of_match_table, .of_match_table = mtdsplit_tplink_of_match_table,
#endif
.parse_fn = mtdsplit_parse_tplink, .parse_fn = mtdsplit_parse_tplink,
.type = MTD_PARSER_TYPE_FIRMWARE, .type = MTD_PARSER_TYPE_FIRMWARE,
}; };

@ -130,22 +130,16 @@ err:
return ret; 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[] = { static const struct of_device_id trx_parser_of_match_table[] = {
{ .compatible = "openwrt,trx" }, { .compatible = "openwrt,trx" },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, trx_parser_of_match_table); MODULE_DEVICE_TABLE(of, trx_parser_of_match_table);
#endif
static struct mtd_part_parser trx_parser = { static struct mtd_part_parser trx_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "trx-fw", .name = "trx-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = trx_parser_of_match_table, .of_match_table = trx_parser_of_match_table,
#endif
.parse_fn = mtdsplit_parse_trx, .parse_fn = mtdsplit_parse_trx,
.type = MTD_PARSER_TYPE_FIRMWARE, .type = MTD_PARSER_TYPE_FIRMWARE,
}; };

Loading…
Cancel
Save