recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/999-2743-drivers-net-dsa-mxl862xx-kernel-compatible.patch

From 5feba07f7e9ccf9c9a3d862e321c84ac4fd089a9 Mon Sep 17 00:00:00 2001
From: "neal.yen" <neal.yen@mediatek.com>
Date: Thu, 26 Sep 2024 20:19:57 +0800
Subject: [PATCH] 999-2743-drivers-net-dsa-mxl862xx-kernel-compatible

---
 drivers/net/dsa/mxl862xx/mxl862xx.c | 32 -----------------------------
 1 file changed, 32 deletions(-)

diff --git a/drivers/net/dsa/mxl862xx/mxl862xx.c b/drivers/net/dsa/mxl862xx/mxl862xx.c
index 5cab346..cbf2fe4 100755
--- a/drivers/net/dsa/mxl862xx/mxl862xx.c
+++ b/drivers/net/dsa/mxl862xx/mxl862xx.c
@@ -1494,7 +1494,6 @@ static void mxl862xx_phylink_mac_link_down(struct dsa_switch *ds, int port,
 	}
 }
 
-#if (KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE)
 static void mxl862xx_phylink_mac_link_up(struct dsa_switch *ds, int port,
 					 unsigned int mode,
 					 phy_interface_t interface,
@@ -1589,32 +1588,6 @@ static void mxl862xx_phylink_mac_link_up(struct dsa_switch *ds, int port,
 	return;
 }
 
-#else
-static void mxl862xx_phylink_mac_link_up(struct dsa_switch *ds, int port,
-					 unsigned int mode,
-					 phy_interface_t interface,
-					 struct phy_device *phydev)
-{
-	mxl862xx_port_link_cfg_t port_link_cfg = { 0 };
-	int ret;
-
-	if (dsa_is_cpu_port(ds, port))
-		return;
-
-	port_link_cfg.port_id = port + 1;
-
-	port_link_cfg.link_force = true;
-	port_link_cfg.link = MXL862XX_PORT_LINK_UP;
-
-	ret = mxl862xx_port_link_cfg_set(&mxl_dev, &port_link_cfg);
-	if (ret != MXL862XX_STATUS_OK) {
-		dev_err(ds->dev,
-			"%s: Port link configuration for port %d failed with %d\n",
-			__func__, port, ret);
-		return;
-	}
-}
-#endif
 #endif
 
 static void mxl862xx_get_ethtool_stats(struct dsa_switch *ds, int port,
@@ -4398,13 +4371,8 @@ static int mxl862xx_change_tag_protocol(struct dsa_switch *ds,
 }
 #endif
 
-#if (KERNEL_VERSION(5, 6, 0) > LINUX_VERSION_CODE)
-static enum dsa_tag_protocol mxl862xx_get_tag_protocol(struct dsa_switch *ds,
-						       int port)
-#else
 static enum dsa_tag_protocol mxl862xx_get_tag_protocol(struct dsa_switch *ds,
 						       int port, enum dsa_tag_protocol m)
-#endif
 {
 	enum dsa_tag_protocol tag_proto;
 
-- 
2.45.2