Commit 98b75c1c authored by Luiz Angelo Daros de Luca's avatar Luiz Angelo Daros de Luca Committed by David S. Miller
Browse files

net: dsa: realtek: merge rtl83xx and interface modules into realtek_dsa 



Since rtl83xx and realtek-{smi,mdio} are always loaded together,
we can optimize resource usage by consolidating them into a single
module.

Signed-off-by: default avatarLuiz Angelo Daros de Luca <luizluca@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8be040ec

drivers/net/dsa/realtek/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ menuconfig NET_DSA_REALTEK 
if NET_DSA_REALTEK



config NET_DSA_REALTEK_MDIO

	tristate "Realtek MDIO interface support"

	bool "Realtek MDIO interface support"

	depends on OF

	help

	  Select to enable support for registering switches configured

	  through MDIO.



config NET_DSA_REALTEK_SMI

	tristate "Realtek SMI interface support"

	bool "Realtek SMI interface support"

	depends on OF

	help

	  Select to enable support for registering switches connected

drivers/net/dsa/realtek/Makefile

+9 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_NET_DSA_REALTEK)		+= realtek_dsa.o

realtek_dsa-objs			:= rtl83xx.o

obj-$(CONFIG_NET_DSA_REALTEK_MDIO) 	+= realtek-mdio.o

obj-$(CONFIG_NET_DSA_REALTEK_SMI) 	+= realtek-smi.o



ifdef CONFIG_NET_DSA_REALTEK_MDIO

realtek_dsa-objs += realtek-mdio.o

endif



ifdef CONFIG_NET_DSA_REALTEK_SMI

realtek_dsa-objs += realtek-smi.o

endif



obj-$(CONFIG_NET_DSA_REALTEK_RTL8366RB) += rtl8366.o

rtl8366-objs 				:= rtl8366-core.o rtl8366rb.o

obj-$(CONFIG_NET_DSA_REALTEK_RTL8365MB) += rtl8365mb.o

drivers/net/dsa/realtek/realtek-mdio.c

+0 −5
Original line number Diff line number Diff line
@@ -186,8 +186,3 @@ void realtek_mdio_shutdown(struct mdio_device *mdiodev) 
	rtl83xx_shutdown(priv);

}

EXPORT_SYMBOL_NS_GPL(realtek_mdio_shutdown, REALTEK_DSA);
 


MODULE_AUTHOR("Luiz Angelo Daros de Luca <luizluca@gmail.com>");

MODULE_DESCRIPTION("Driver for Realtek ethernet switch connected via MDIO interface");

MODULE_LICENSE("GPL");

MODULE_IMPORT_NS(REALTEK_DSA);

drivers/net/dsa/realtek/realtek-smi.c

+0 −5
Original line number Diff line number Diff line
@@ -470,8 +470,3 @@ void realtek_smi_shutdown(struct platform_device *pdev) 
	rtl83xx_shutdown(priv);

}

EXPORT_SYMBOL_NS_GPL(realtek_smi_shutdown, REALTEK_DSA);
 


MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");

MODULE_DESCRIPTION("Driver for Realtek ethernet switch connected via SMI interface");

MODULE_LICENSE("GPL");

MODULE_IMPORT_NS(REALTEK_DSA);

drivers/net/dsa/realtek/rtl83xx.c

+1 −0
Original line number Diff line number Diff line
@@ -231,5 +231,6 @@ void rtl83xx_remove(struct realtek_priv *priv) 
EXPORT_SYMBOL_NS_GPL(rtl83xx_remove, REALTEK_DSA);



MODULE_AUTHOR("Luiz Angelo Daros de Luca <luizluca@gmail.com>");

MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");

MODULE_DESCRIPTION("Realtek DSA switches common module");

MODULE_LICENSE("GPL");