git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From 98b75c1c149c653ad11a440636213eb070325158 Mon Sep 17 00:00:00 2001
   2 From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
   3 Date: Fri, 9 Feb 2024 02:03:42 -0300
   4 Subject: net: dsa: realtek: merge rtl83xx and interface
   5  modules into realtek_dsa
   6
   7 Since rtl83xx and realtek-{smi,mdio} are always loaded together,
   8 we can optimize resource usage by consolidating them into a single
   9 module.
  10
  11 Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
  12 Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
  13 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
  14 Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
  15 Signed-off-by: David S. Miller <davem@davemloft.net>
  16 ---
  17  drivers/net/dsa/realtek/Kconfig        |  4 ++--
  18  drivers/net/dsa/realtek/Makefile       | 11 +++++++++--
  19  drivers/net/dsa/realtek/realtek-mdio.c |  5 -----
  20  drivers/net/dsa/realtek/realtek-smi.c  |  5 -----
  21  drivers/net/dsa/realtek/rtl83xx.c      |  1 +
  22  5 files changed, 12 insertions(+), 14 deletions(-)
  23
  24 --- a/drivers/net/dsa/realtek/Kconfig
  25 +++ b/drivers/net/dsa/realtek/Kconfig
  26 @@ -16,14 +16,14 @@ menuconfig NET_DSA_REALTEK
  27  if NET_DSA_REALTEK
  28
  29  config NET_DSA_REALTEK_MDIO
  30 -       tristate "Realtek MDIO interface support"
  31 +       bool "Realtek MDIO interface support"
  32         depends on OF
  33         help
  34           Select to enable support for registering switches configured
  35           through MDIO.
  36
  37  config NET_DSA_REALTEK_SMI
  38 -       tristate "Realtek SMI interface support"
  39 +       bool "Realtek SMI interface support"
  40         depends on OF
  41         help
  42           Select to enable support for registering switches connected
  43 --- a/drivers/net/dsa/realtek/Makefile
  44 +++ b/drivers/net/dsa/realtek/Makefile
  45 @@ -1,8 +1,15 @@
  46  # SPDX-License-Identifier: GPL-2.0
  47  obj-$(CONFIG_NET_DSA_REALTEK)          += realtek_dsa.o
  48  realtek_dsa-objs                       := rtl83xx.o
  49 -obj-$(CONFIG_NET_DSA_REALTEK_MDIO)     += realtek-mdio.o
  50 -obj-$(CONFIG_NET_DSA_REALTEK_SMI)      += realtek-smi.o
  51 +
  52 +ifdef CONFIG_NET_DSA_REALTEK_MDIO
  53 +realtek_dsa-objs += realtek-mdio.o
  54 +endif
  55 +
  56 +ifdef CONFIG_NET_DSA_REALTEK_SMI
  57 +realtek_dsa-objs += realtek-smi.o
  58 +endif
  59 +
  60  obj-$(CONFIG_NET_DSA_REALTEK_RTL8366RB) += rtl8366.o
  61  rtl8366-objs                           := rtl8366-core.o rtl8366rb.o
  62  obj-$(CONFIG_NET_DSA_REALTEK_RTL8365MB) += rtl8365mb.o
  63 --- a/drivers/net/dsa/realtek/realtek-mdio.c
  64 +++ b/drivers/net/dsa/realtek/realtek-mdio.c
  65 @@ -186,8 +186,3 @@ void realtek_mdio_shutdown(struct mdio_d
  66         rtl83xx_shutdown(priv);
  67  }
  68  EXPORT_SYMBOL_NS_GPL(realtek_mdio_shutdown, REALTEK_DSA);
  69 -
  70 -MODULE_AUTHOR("Luiz Angelo Daros de Luca <luizluca@gmail.com>");
  71 -MODULE_DESCRIPTION("Driver for Realtek ethernet switch connected via MDIO interface");
  72 -MODULE_LICENSE("GPL");
  73 -MODULE_IMPORT_NS(REALTEK_DSA);
  74 --- a/drivers/net/dsa/realtek/realtek-smi.c
  75 +++ b/drivers/net/dsa/realtek/realtek-smi.c
  76 @@ -470,8 +470,3 @@ void realtek_smi_shutdown(struct platfor
  77         rtl83xx_shutdown(priv);
  78  }
  79  EXPORT_SYMBOL_NS_GPL(realtek_smi_shutdown, REALTEK_DSA);
  80 -
  81 -MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
  82 -MODULE_DESCRIPTION("Driver for Realtek ethernet switch connected via SMI interface");
  83 -MODULE_LICENSE("GPL");
  84 -MODULE_IMPORT_NS(REALTEK_DSA);
  85 --- a/drivers/net/dsa/realtek/rtl83xx.c
  86 +++ b/drivers/net/dsa/realtek/rtl83xx.c
  87 @@ -232,5 +232,6 @@ void rtl83xx_remove(struct realtek_priv
  88  EXPORT_SYMBOL_NS_GPL(rtl83xx_remove, REALTEK_DSA);
  89
  90  MODULE_AUTHOR("Luiz Angelo Daros de Luca <luizluca@gmail.com>");
  91 +MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
  92  MODULE_DESCRIPTION("Realtek DSA switches common module");
  93  MODULE_LICENSE("GPL");