Message ID | 20240204123151.55005-1-masahiroy@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 81f61c108838190a3e00bcb8f973966b7a90794c |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | net: ethernet: remove duplicated CONFIG_SUNGEM_PHY entry | expand |
On Sun, Feb 04, 2024 at 09:31:51PM +0900, Masahiro Yamada wrote: > Both drivers/net/Kconfig and drivers/net/ethernet/Kconfig contain the > same config entry: > > config SUNGEM_PHY > tristate > > Commit f860b0522f65 ("drivers/net: Kconfig and Makefile cleanup") moved > SUNGEM_PHY from drivers/net/Kconfig to drivers/net/ethernet/Kconfig. > > Shortly after it was applied, commit 19e2f6fe9601 ("net: Fix sungem_phy > sharing.") added the second one to drivers/net/Kconfig. > > I kept the one in drivers/net/Kconfig because this CONFIG option controls > the compilation of drivers/net/sungem_phy.c. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Thanks Yamada-san, This looks good to me as-is, but I guess a follow-up question is if sungem_phy.c should move to drivers/net/phy. Reviewed-by: Simon Horman <horms@kernel.org> > --- > > drivers/net/ethernet/Kconfig | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig > index 5a274b99f299..6a19b5393ed1 100644 > --- a/drivers/net/ethernet/Kconfig > +++ b/drivers/net/ethernet/Kconfig > @@ -15,9 +15,6 @@ if ETHERNET > config MDIO > tristate > > -config SUNGEM_PHY > - tristate > - > source "drivers/net/ethernet/3com/Kconfig" > source "drivers/net/ethernet/actions/Kconfig" > source "drivers/net/ethernet/adaptec/Kconfig" > -- > 2.40.1 > >
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Sun, 4 Feb 2024 21:31:51 +0900 you wrote: > Both drivers/net/Kconfig and drivers/net/ethernet/Kconfig contain the > same config entry: > > config SUNGEM_PHY > tristate > > Commit f860b0522f65 ("drivers/net: Kconfig and Makefile cleanup") moved > SUNGEM_PHY from drivers/net/Kconfig to drivers/net/ethernet/Kconfig. > > [...] Here is the summary with links: - net: ethernet: remove duplicated CONFIG_SUNGEM_PHY entry https://git.kernel.org/netdev/net-next/c/81f61c108838 You are awesome, thank you!
On Tue, Feb 06, 2024 at 05:41:30PM +0000, Simon Horman wrote: > On Sun, Feb 04, 2024 at 09:31:51PM +0900, Masahiro Yamada wrote: > > Both drivers/net/Kconfig and drivers/net/ethernet/Kconfig contain the > > same config entry: > > > > config SUNGEM_PHY > > tristate > > > > Commit f860b0522f65 ("drivers/net: Kconfig and Makefile cleanup") moved > > SUNGEM_PHY from drivers/net/Kconfig to drivers/net/ethernet/Kconfig. > > > > Shortly after it was applied, commit 19e2f6fe9601 ("net: Fix sungem_phy > > sharing.") added the second one to drivers/net/Kconfig. > > > > I kept the one in drivers/net/Kconfig because this CONFIG option controls > > the compilation of drivers/net/sungem_phy.c. > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > Thanks Yamada-san, > > This looks good to me as-is, > but I guess a follow-up question is if sungem_phy.c > should move to drivers/net/phy. It is not a phylib PHY driver. So i would say no. It would however be nice to port the MAC drivers using this to phylib. The PHY devices this sungem_phy.c supports don't look particularly exotic, just Marvell and Broadcom PHYs which phylib probably already supports. Andrew
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 5a274b99f299..6a19b5393ed1 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -15,9 +15,6 @@ if ETHERNET config MDIO tristate -config SUNGEM_PHY - tristate - source "drivers/net/ethernet/3com/Kconfig" source "drivers/net/ethernet/actions/Kconfig" source "drivers/net/ethernet/adaptec/Kconfig"
Both drivers/net/Kconfig and drivers/net/ethernet/Kconfig contain the same config entry: config SUNGEM_PHY tristate Commit f860b0522f65 ("drivers/net: Kconfig and Makefile cleanup") moved SUNGEM_PHY from drivers/net/Kconfig to drivers/net/ethernet/Kconfig. Shortly after it was applied, commit 19e2f6fe9601 ("net: Fix sungem_phy sharing.") added the second one to drivers/net/Kconfig. I kept the one in drivers/net/Kconfig because this CONFIG option controls the compilation of drivers/net/sungem_phy.c. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- drivers/net/ethernet/Kconfig | 3 --- 1 file changed, 3 deletions(-)