net: mscc: ocelot: rename MSCC_OCELOT_SWITCH_OCELOT to MSCC_OCELOT_SWITCH

Putting 'ocelot' in the config's name twice just to say that 'it's the
ocelot driver running on the ocelot SoC' is a bit confusing. Instead,
it's just the ocelot driver. Now that we've renamed the previous symbol
that was holding the MSCC_OCELOT_SWITCH_OCELOT into *_LIB (because
that's what it is), we're free to use this name for the driver.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mscc/Kconfig b/drivers/net/ethernet/mscc/Kconfig
index 24db927e8b3014d6a8fb3a402a50735d898b8ca4..3cfd1b629886108eeb7b113a848275a2f802b69e 100644 (file)
--- a/drivers/net/ethernet/mscc/Kconfig
+++ b/drivers/net/ethernet/mscc/Kconfig
@@ -18,8 +18,8 @@ config MSCC_OCELOT_SWITCH_LIB
          This is a hardware support library for Ocelot network switches. It is
          used by switchdev as well as by DSA drivers.
 
-config MSCC_OCELOT_SWITCH_OCELOT
-       tristate "Ocelot switch driver on Ocelot"
+config MSCC_OCELOT_SWITCH
+       tristate "Ocelot switch driver"
        depends on NET_SWITCHDEV
        depends on GENERIC_PHY
        depends on REGMAP_MMIO
@@ -29,6 +29,6 @@ config MSCC_OCELOT_SWITCH_OCELOT
        select MSCC_OCELOT_SWITCH_LIB
        help
          This driver supports the Ocelot network switch device as present on
-         the Ocelot SoCs.
+         the Ocelot SoCs (VSC7514).
 
 endif # NET_VENDOR_MICROSEMI

diff --git a/drivers/net/ethernet/mscc/Makefile b/drivers/net/ethernet/mscc/Makefile
index 77222e47d63f44bb2ec05d6e7a06f9a344f28f50..c6d372b6dc3fe32fc6a8c8a4b18a1a22a4e0c8dd 100644 (file)
--- a/drivers/net/ethernet/mscc/Makefile
+++ b/drivers/net/ethernet/mscc/Makefile
@@ -9,5 +9,5 @@ mscc_ocelot_switch_lib-y := \
        ocelot_ace.o \
        ocelot_flower.o \
        ocelot_ptp.o
-obj-$(CONFIG_MSCC_OCELOT_SWITCH_OCELOT) += mscc_ocelot.o
+obj-$(CONFIG_MSCC_OCELOT_SWITCH) += mscc_ocelot.o
 mscc_ocelot-y := ocelot_vsc7514.o