| Message ID | 20190612081147.1372-1-anders.roxell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] drivers: net: dsa: fix warning same module names | expand |
On Wed, Jun 12, 2019 at 10:11 AM Anders Roxell <anders.roxell@linaro.org> wrote: > When building with CONFIG_NET_DSA_REALTEK_SMI and CONFIG_REALTEK_PHY > enabled as loadable modules, we see the following warning: > > warning: same module names found: > drivers/net/phy/realtek.ko > drivers/net/dsa/realtek.ko > > Rework so the driver name is rtl8366 instead of realtek. > > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Sorry for giving bad advice here on IRC... my wrong. > -obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek.o > -realtek-objs := realtek-smi.o rtl8366.o rtl8366rb.o > +obj-$(CONFIG_NET_DSA_REALTEK_SMI) += rtl8366.o > +rtl8366-objs := realtek-smi.o rtl8366-common.o rtl8366rb.o What is common for this family is not the name rtl8366 (there is for example rtl8369 in this family, we just haven't added it yet) but the common technical item is SMI. So I would suggest something like: obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek-smi.o realtek-smi-objs := realtek-smi-core.o rtl8366.o rtl8366rb.o I.e. rename the realtel-smi.c to realtek-smi-core.c instead and go with that. With that change: Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Wed, Jun 12, 2019 at 02:36:44PM +0200, Linus Walleij wrote: > On Wed, Jun 12, 2019 at 10:11 AM Anders Roxell <anders.roxell@linaro.org> wrote: > > > When building with CONFIG_NET_DSA_REALTEK_SMI and CONFIG_REALTEK_PHY > > enabled as loadable modules, we see the following warning: > > > > warning: same module names found: > > drivers/net/phy/realtek.ko > > drivers/net/dsa/realtek.ko > > > > Rework so the driver name is rtl8366 instead of realtek. > > > > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > > Sorry for giving bad advice here on IRC... my wrong. > > > -obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek.o > > -realtek-objs := realtek-smi.o rtl8366.o rtl8366rb.o > > +obj-$(CONFIG_NET_DSA_REALTEK_SMI) += rtl8366.o > > +rtl8366-objs := realtek-smi.o rtl8366-common.o rtl8366rb.o > > What is common for this family is not the name rtl8366 > (there is for example rtl8369 in this family, we just haven't > added it yet) but the common technical item is SMI. Hi Linus I was not sure about this. I thought SMI was the bus used to communicate with the switch. It just seemed odd to call a switch family after the bus. Anyway, if you are happy with the name realtek-smi: Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Wed, Jun 12, 2019 at 3:16 PM Andrew Lunn <andrew@lunn.ch> wrote: > On Wed, Jun 12, 2019 at 02:36:44PM +0200, Linus Walleij wrote: > > Sorry for giving bad advice here on IRC... my wrong. > > > > > -obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek.o > > > -realtek-objs := realtek-smi.o rtl8366.o rtl8366rb.o > > > +obj-$(CONFIG_NET_DSA_REALTEK_SMI) += rtl8366.o > > > +rtl8366-objs := realtek-smi.o rtl8366-common.o rtl8366rb.o > > > > What is common for this family is not the name rtl8366 > > (there is for example rtl8369 in this family, we just haven't > > added it yet) but the common technical item is SMI. > > Hi Linus > > I was not sure about this. I thought SMI was the bus used to > communicate with the switch. It just seemed odd to call a switch > family after the bus. It is true, but as can be seen from: Documentation/devicetree/bindings/net/dsa/realtek-smi.txt it is a family of 8 switches. I think we should just have one module handling all of them for simplicity, once we get around to implementing anything else than RTL8366RB that is. It's these 8 switches that talk SMI and they have a lot in common like talking RRCP internally AFAICT. I think these switches are pretty complex on the inside, we just don't have very good documentation :/ > Anyway, if you are happy with the name realtek-smi: > > Reviewed-by: Andrew Lunn <andrew@lunn.ch> Thanks! Yours, Linus Walleij
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile index fefb6aaa82ba..d7a282eb2ff9 100644 --- a/drivers/net/dsa/Makefile +++ b/drivers/net/dsa/Makefile @@ -9,8 +9,8 @@ obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o obj-$(CONFIG_NET_DSA_MT7530) += mt7530.o obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o obj-$(CONFIG_NET_DSA_QCA8K) += qca8k.o -obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek.o -realtek-objs := realtek-smi.o rtl8366.o rtl8366rb.o +obj-$(CONFIG_NET_DSA_REALTEK_SMI) += rtl8366.o +rtl8366-objs := realtek-smi.o rtl8366-common.o rtl8366rb.o obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366-common.c similarity index 100% rename from drivers/net/dsa/rtl8366.c rename to drivers/net/dsa/rtl8366-common.c
When building with CONFIG_NET_DSA_REALTEK_SMI and CONFIG_REALTEK_PHY enabled as loadable modules, we see the following warning: warning: same module names found: drivers/net/phy/realtek.ko drivers/net/dsa/realtek.ko Rework so the driver name is rtl8366 instead of realtek. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- drivers/net/dsa/Makefile | 4 ++-- drivers/net/dsa/{rtl8366.c => rtl8366-common.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename drivers/net/dsa/{rtl8366.c => rtl8366-common.c} (100%) -- 2.20.1