hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generic: drop outdated kernel version switches in local drivers 

This drops the obsolete version switches for non-supported kernels
from local drivers in generic target.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
master
Adrian Schmutzler 2020-05-13 14:47:48 +02:00
parent b510ab513e
commit 8ff813e5f4
5 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c
View File

@ -245,19 +245,15 @@ mtdsplit_uimage_parse_generic(struct mtd_info *master,
uimage_verify_default); uimage_verify_default);
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
static const struct of_device_id mtdsplit_uimage_of_match_table[] = { static const struct of_device_id mtdsplit_uimage_of_match_table[] = {
{ .compatible = "denx,uimage" }, { .compatible = "denx,uimage" },
{}, {},
}; };
#endif
static struct mtd_part_parser uimage_generic_parser = { static struct mtd_part_parser uimage_generic_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "uimage-fw", .name = "uimage-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = mtdsplit_uimage_of_match_table, .of_match_table = mtdsplit_uimage_of_match_table,
#endif
.parse_fn = mtdsplit_uimage_parse_generic, .parse_fn = mtdsplit_uimage_parse_generic,
.type = MTD_PARSER_TYPE_FIRMWARE, .type = MTD_PARSER_TYPE_FIRMWARE,
}; };
@ -312,19 +308,15 @@ mtdsplit_uimage_parse_netgear(struct mtd_info *master,
uimage_verify_wndr3700); uimage_verify_wndr3700);
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
static const struct of_device_id mtdsplit_uimage_netgear_of_match_table[] = { static const struct of_device_id mtdsplit_uimage_netgear_of_match_table[] = {
{ .compatible = "netgear,uimage" }, { .compatible = "netgear,uimage" },
{}, {},
}; };
#endif
static struct mtd_part_parser uimage_netgear_parser = { static struct mtd_part_parser uimage_netgear_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "netgear-fw", .name = "netgear-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = mtdsplit_uimage_netgear_of_match_table, .of_match_table = mtdsplit_uimage_netgear_of_match_table,
#endif
.parse_fn = mtdsplit_uimage_parse_netgear, .parse_fn = mtdsplit_uimage_parse_netgear,
.type = MTD_PARSER_TYPE_FIRMWARE, .type = MTD_PARSER_TYPE_FIRMWARE,
}; };
@ -364,19 +356,15 @@ mtdsplit_uimage_parse_edimax(struct mtd_info *master,
uimage_find_edimax); uimage_find_edimax);
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
static const struct of_device_id mtdsplit_uimage_edimax_of_match_table[] = { static const struct of_device_id mtdsplit_uimage_edimax_of_match_table[] = {
{ .compatible = "edimax,uimage" }, { .compatible = "edimax,uimage" },
{}, {},
}; };
#endif
static struct mtd_part_parser uimage_edimax_parser = { static struct mtd_part_parser uimage_edimax_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "edimax-fw", .name = "edimax-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = mtdsplit_uimage_edimax_of_match_table, .of_match_table = mtdsplit_uimage_edimax_of_match_table,
#endif
.parse_fn = mtdsplit_uimage_parse_edimax, .parse_fn = mtdsplit_uimage_parse_edimax,
.type = MTD_PARSER_TYPE_FIRMWARE, .type = MTD_PARSER_TYPE_FIRMWARE,
}; };
@ -407,19 +395,15 @@ mtdsplit_uimage_parse_fonfxc(struct mtd_info *master,
uimage_find_fonfxc); uimage_find_fonfxc);
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
static const struct of_device_id mtdsplit_uimage_fonfxc_of_match_table[] = { static const struct of_device_id mtdsplit_uimage_fonfxc_of_match_table[] = {
{ .compatible = "fonfxc,uimage" }, { .compatible = "fonfxc,uimage" },
{}, {},
}; };
#endif
static struct mtd_part_parser uimage_fonfxc_parser = { static struct mtd_part_parser uimage_fonfxc_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "fonfxc-fw", .name = "fonfxc-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = mtdsplit_uimage_fonfxc_of_match_table, .of_match_table = mtdsplit_uimage_fonfxc_of_match_table,
#endif
.parse_fn = mtdsplit_uimage_parse_fonfxc, .parse_fn = mtdsplit_uimage_parse_fonfxc,
}; };
@ -464,19 +448,15 @@ mtdsplit_uimage_parse_okli(struct mtd_info *master,
uimage_verify_okli); uimage_verify_okli);
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
static const struct of_device_id mtdsplit_uimage_okli_of_match_table[] = { static const struct of_device_id mtdsplit_uimage_okli_of_match_table[] = {
{ .compatible = "openwrt,okli" }, { .compatible = "openwrt,okli" },
{}, {},
}; };
#endif
static struct mtd_part_parser uimage_okli_parser = { static struct mtd_part_parser uimage_okli_parser = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "okli-fw", .name = "okli-fw",
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
.of_match_table = mtdsplit_uimage_okli_of_match_table, .of_match_table = mtdsplit_uimage_okli_of_match_table,
#endif
.parse_fn = mtdsplit_uimage_parse_okli, .parse_fn = mtdsplit_uimage_parse_okli,
}; };

7
target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
View File

@ -314,9 +314,8 @@ static inline int b53_write64(struct b53_device *dev, u8 page, u8 reg,
#endif #endif
#include <linux/version.h> #include <linux/version.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
#include <linux/bcm47xx_nvram.h> #include <linux/bcm47xx_nvram.h>
#endif
static inline int b53_switch_get_reset_gpio(struct b53_device *dev) static inline int b53_switch_get_reset_gpio(struct b53_device *dev)
{ {
#ifdef CONFIG_BCM47XX #ifdef CONFIG_BCM47XX
@ -331,11 +330,7 @@ static inline int b53_switch_get_reset_gpio(struct b53_device *dev)
} }
#endif #endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
return bcm47xx_nvram_gpio_pin("robo_reset"); return bcm47xx_nvram_gpio_pin("robo_reset");
#else
return -ENOENT;
#endif
} }
#endif #endif

3
target/linux/generic/files/drivers/net/phy/rtl8306.c
View File

@ -1033,9 +1033,6 @@ rtl8306_read_status(struct phy_device *pdev)
static struct phy_driver rtl8306_driver = { static struct phy_driver rtl8306_driver = {
.name = "Realtek RTL8306S", .name = "Realtek RTL8306S",
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,13,0))
.flags = PHY_HAS_MAGICANEG,
#endif
.phy_id = RTL8306_MAGIC, .phy_id = RTL8306_MAGIC,
.phy_id_mask = 0xffffffff, .phy_id_mask = 0xffffffff,
.features = PHY_BASIC_FEATURES, .features = PHY_BASIC_FEATURES,

8
target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
View File

@ -1035,14 +1035,6 @@ static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
dev_name(smi->parent)); dev_name(smi->parent));
smi->mii_bus->parent = smi->parent; smi->mii_bus->parent = smi->parent;
smi->mii_bus->phy_mask = ~(0x1f); smi->mii_bus->phy_mask = ~(0x1f);
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
{
int i;
smi->mii_bus->irq = smi->mii_irq;
for (i = 0; i < PHY_MAX_ADDR; i++)
smi->mii_irq[i] = PHY_POLL;
}
#endif
#ifdef CONFIG_OF #ifdef CONFIG_OF
if (np) if (np)

16
target/linux/generic/files/drivers/net/phy/swconfig.c
View File

@ -594,12 +594,9 @@ swconfig_parse_ports(struct sk_buff *msg, struct nlattr *head,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
if (nla_parse_nested_deprecated(tb, SWITCH_PORT_ATTR_MAX, nla, if (nla_parse_nested_deprecated(tb, SWITCH_PORT_ATTR_MAX, nla,
port_policy, NULL)) port_policy, NULL))
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
if (nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, nla,
port_policy, NULL))
#else #else
if (nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, nla, if (nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, nla,
port_policy)) port_policy, NULL))
#endif #endif
return -EINVAL; return -EINVAL;
@ -623,10 +620,8 @@ swconfig_parse_link(struct sk_buff *msg, struct nlattr *nla,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0)
if (nla_parse_nested_deprecated(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy, NULL)) if (nla_parse_nested_deprecated(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy, NULL))
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
if (nla_parse_nested(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy, NULL))
#else #else
if (nla_parse_nested(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy)) if (nla_parse_nested(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy, NULL))
#endif #endif
return -EINVAL; return -EINVAL;
@ -1110,9 +1105,6 @@ static struct genl_ops swconfig_ops[] = {
}; };
static struct genl_family switch_fam = { static struct genl_family switch_fam = {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
.id = GENL_ID_GENERATE,
#endif
.name = "switch", .name = "switch",
.hdrsize = 0, .hdrsize = 0,
.version = 1, .version = 1,
@ -1298,11 +1290,7 @@ swconfig_init(void)
{ {
INIT_LIST_HEAD(&swdevs); INIT_LIST_HEAD(&swdevs);
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
return genl_register_family_with_ops(&switch_fam, swconfig_ops);
#else
return genl_register_family(&switch_fam); return genl_register_family(&switch_fam);
#endif
} }
static void __exit static void __exit