From fbc87b675529c7536c38008c776f994c69c6687d Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 13 May 2020 14:47:48 +0200 Subject: [PATCH] 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 --- target/linux/generic/files/drivers/net/phy/b53/b53_priv.h | 7 +------ target/linux/generic/files/drivers/net/phy/rtl8366_smi.c | 8 -------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h b/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h index a9296c9421..37c17aeb25 100644 --- a/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h +++ b/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h @@ -314,9 +314,8 @@ static inline int b53_write64(struct b53_device *dev, u8 page, u8 reg, #endif #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) #include -#endif + static inline int b53_switch_get_reset_gpio(struct b53_device *dev) { #ifdef CONFIG_BCM47XX @@ -331,11 +330,7 @@ static inline int b53_switch_get_reset_gpio(struct b53_device *dev) } #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) return bcm47xx_nvram_gpio_pin("robo_reset"); -#else - return -ENOENT; -#endif } #endif diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c index 2c4d53fc67..e8375e5147 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c @@ -1035,14 +1035,6 @@ static int rtl8366_smi_mii_init(struct rtl8366_smi *smi) dev_name(smi->parent)); smi->mii_bus->parent = smi->parent; 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 if (np)