net: dsa: fix warning same module names
Subsystems (3)
PATCH v3 1/1 net: dsa: fix warning same module names
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 realtek-smi instead of realtek.
Reviewed-by Linus Walleij <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
Signed-off-by Anders Roxell <[email protected]>
---
drivers/net/dsa/Makefile | 4 ++--
drivers/net/dsa/{realtek-smi.c => realtek-smi-core.c} | 2 +-
drivers/net/dsa/{realtek-smi.h => realtek-smi-core.h} | 0
drivers/net/dsa/rtl8366.c | 2 +-
drivers/net/dsa/rtl8366rb.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename drivers/net/dsa/{realtek-smi.c => realtek-smi-core.c} (99%)
rename drivers/net/dsa/{realtek-smi.h => realtek-smi-core.h} (100%)drivers/net/dsa/Makefile +2 -2
@@ -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) += realtek-smi.o +realtek-smi-objs := realtek-smi-core.o rtl8366.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
drivers/net/dsa/realtek-smi-core.c renamed from drivers/net/dsa/realtek-smi.c +1 -1
@@ -40,7 +40,7 @@#include <linux/bitops.h> #include <linux/if_bridge.h> -#include "realtek-smi.h" +#include "realtek-smi-core.h" #define REALTEK_SMI_ACK_RETRY_COUNT 5#define REALTEK_SMI_HW_STOP_DELAY 25/* msecs */
drivers/net/dsa/realtek-smi-core.h renamed from drivers/net/dsa/realtek-smi.h +0 -0
drivers/net/dsa/rtl8366.c +1 -1
@@ -11,7 +11,7 @@#include <linux/if_bridge.h> #include <net/dsa.h> -#include "realtek-smi.h" +#include "realtek-smi-core.h" int rtl8366_mc_is_used (struct realtek_smi *smi,int mc_index,int *used) {
drivers/net/dsa/rtl8366rb.c +1 -1
@@ -20,7 +20,7 @@#include <linux/of_irq.h> #include <linux/regmap.h> -#include "realtek-smi.h" +#include "realtek-smi-core.h" #define RTL8366RB_PORT_NUM_CPU 5#define RTL8366RB_NUM_PORTS 6
Signature · 1 line
2.20.1
From: Anders Roxell <[email protected]>
Date: Thu, 13 Jun 2019 13:35:03 +0200
Quoted 7 lines
When building with
CONFIG_NET_DSA_REALTEK_SMIandCONFIG_REALTEK_PHYenabled as loadable modules, we see the following warning:warning: same module names found:
drivers/net/phy/realtek.ko
drivers/net/dsa/realtek.ko
Quoted 5 lines
Rework so the driver name is realtek-smi instead of realtek.
Reviewed-by Linus Walleij <[email protected]>Reviewed-by Andrew Lunn <[email protected]>Signed-off-by Anders Roxell <[email protected]>
Applied.