From bd22bde92ed62d3ae52164e1428c7dbc43eb14f8 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 10 Jan 2023 11:19:40 -0500 Subject: [PATCH] net: phy: mv88e61xx: Finish migration of MV88E61XX_FIXED_PORTS Set the default for MV88E61XX_FIXED_PORTS to 0x0 in Kconfig, and move the comment from code to the help to explain what this does. Signed-off-by: Tom Rini Reviewed-by: Ramon Fried --- drivers/net/phy/Kconfig | 4 ++++ drivers/net/phy/mv88e61xx.c | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 580ac8e8fb..5eaff053a0 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -62,6 +62,10 @@ config MV88E61XX_PHY_PORTS config MV88E61XX_FIXED_PORTS hex "Bitmask of PHYless serdes Ports" + default 0x0 + help + These are ports without PHYs that may be wired directly to other + serdes interfaces endif # MV88E61XX_SWITCH diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c index 7eff37b244..7ab60164c7 100644 --- a/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c @@ -167,14 +167,6 @@ #error Define CONFIG_MV88E61XX_CPU_PORT to the port the CPU is attached to #endif -/* - * These are ports without PHYs that may be wired directly - * to other serdes interfaces - */ -#ifndef CONFIG_MV88E61XX_FIXED_PORTS -#define CONFIG_MV88E61XX_FIXED_PORTS 0 -#endif - /* ID register values for different switch models */ #define PORT_SWITCH_ID_6020 0x0200 #define PORT_SWITCH_ID_6070 0x0700 -- 2.39.5