| Message ID | 20230110161946.3816866-13-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | bd22bde92ed62d3ae52164e1428c7dbc43eb14f8 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/19] global: Remove unused CONFIG defines | expand |
On Tue, Jan 10, 2023 at 6:23 PM Tom Rini <trini@konsulko.com> wrote: > > 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 <trini@konsulko.com> > --- > 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 580ac8e8fba2..5eaff053a09c 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 7eff37b24499..7ab60164c774 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.25.1 > Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 580ac8e8fba2..5eaff053a09c 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 7eff37b24499..7ab60164c774 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
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 <trini@konsulko.com> --- drivers/net/phy/Kconfig | 4 ++++ drivers/net/phy/mv88e61xx.c | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-)