diff options
| author | Aleksander Jan Bajkowski <olek2@wp.pl> | 2023-05-14 11:43:57 +0200 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2023-05-20 15:19:14 +0200 |
| commit | 7365e6b00a7ab823467b7d92d4f3f0bdbe271f35 (patch) | |
| tree | f3a7cc668c0e4b4a9c3c46a7aac21117a7ed2fc5 /target/linux/ramips/files | |
| parent | 5e91b4507c0010970482099464b44a5404835caa (diff) | |
| download | openwrt-7365e6b00a7ab823467b7d92d4f3f0bdbe271f35.tar.gz openwrt-7365e6b00a7ab823467b7d92d4f3f0bdbe271f35.tar.bz2 openwrt-7365e6b00a7ab823467b7d92d4f3f0bdbe271f35.zip | |
kernel: remove obsolete kernel version switches
This removes unneeded kernel version switches from the targets after
kernel 5.10 has been dropped.
Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
Diffstat (limited to 'target/linux/ramips/files')
5 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c index b923b02af9..a6448443c0 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c @@ -64,11 +64,7 @@ int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node, int { const __be32 *_phy_addr = NULL; struct phy_device *phydev; -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) - int phy_mode; -#else phy_interface_t phy_mode = PHY_INTERFACE_MODE_NA; -#endif _phy_addr = of_get_property(phy_node, "reg", NULL); @@ -77,13 +73,8 @@ int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node, int return -EINVAL; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) - phy_mode = of_get_phy_mode(phy_node); - if (phy_mode < 0) { -#else of_get_phy_mode(phy_node, &phy_mode); if (phy_mode == PHY_INTERFACE_MODE_NA) { -#endif dev_err(priv->dev, "incorrect phy-mode %d\n", phy_mode); priv->phy->phy_node[port] = NULL; return -EINVAL; diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.c index 6242cf9b42..0c47d11846 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.c @@ -156,11 +156,7 @@ void rt2880_port_init(struct fe_priv *priv, struct device_node *np) const __be32 *id = of_get_property(np, "reg", NULL); const __be32 *link; int size; -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) - int phy_mode; -#else phy_interface_t phy_mode = PHY_INTERFACE_MODE_NA; -#endif if (!id || (be32_to_cpu(*id) != 0)) { pr_err("%s: invalid port id\n", np->name); @@ -176,11 +172,7 @@ void rt2880_port_init(struct fe_priv *priv, struct device_node *np) return; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) - phy_mode = of_get_phy_mode(np); -#else of_get_phy_mode(np, &phy_mode); -#endif switch (phy_mode) { case PHY_INTERFACE_MODE_RGMII: break; diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c index 9876a247e3..b79b348938 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c @@ -1096,11 +1096,7 @@ poll_again: return rx_done; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) -static void fe_tx_timeout(struct net_device *dev) -#else static void fe_tx_timeout(struct net_device *dev, unsigned int txqueue) -#endif { struct fe_priv *priv = netdev_priv(dev); struct fe_tx_ring *ring = &priv->tx_ring; diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c index 42685eebc3..a4b2908d59 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c @@ -144,11 +144,7 @@ static void mt7620_port_init(struct fe_priv *priv, struct device_node *np) struct mt7620_gsw *gsw = (struct mt7620_gsw *)priv->soc->swpriv; const __be32 *_id = of_get_property(np, "reg", NULL); const __be32 *phy_addr; -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) - int phy_mode; -#else phy_interface_t phy_mode = PHY_INTERFACE_MODE_NA; -#endif int size, id; int shift = 12; u32 val, mask = 0; @@ -178,11 +174,7 @@ static void mt7620_port_init(struct fe_priv *priv, struct device_node *np) priv->phy->phy_fixed[id] = NULL; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) - phy_mode = of_get_phy_mode(np); -#else of_get_phy_mode(np, &phy_mode); -#endif switch (phy_mode) { case PHY_INTERFACE_MODE_RGMII: mask = 0; diff --git a/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c b/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c index 4e75c9bf07..4900c5a0c0 100644 --- a/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c +++ b/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c @@ -386,11 +386,6 @@ static const struct pinconf_ops aw9523_pinconf_ops = { .is_generic = true, }; -#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 5, 0) -#define GPIO_LINE_DIRECTION_IN 1 -#define GPIO_LINE_DIRECTION_OUT 0 -#endif - /* * aw9523_get_pin_direction - Get pin direction * @regmap: Regmap structure @@ -437,11 +432,6 @@ static int aw9523_get_port_state(struct regmap *regmap, u8 pin, return regmap_read(regmap, reg, state); } -#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 5, 0) -#undef GPIO_LINE_DIRECTION_IN -#undef GPIO_LINE_DIRECTION_OUT -#endif - static int aw9523_gpio_irq_type(struct irq_data *d, unsigned int type) { switch (type) { |