aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/files/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ramips/files/drivers/net')
-rw-r--r--target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c9
-rw-r--r--target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.c8
-rw-r--r--target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c4
-rw-r--r--target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c8
4 files changed, 0 insertions, 29 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;