net: phy: remove Kconfig symbol MDIO_DEVRES

MDIO_DEVRES is only set where PHYLIB/PHYLINK are set which
select MDIO_DEVRES. So we can remove this symbol.

Note: Due to circular module dependencies we can't simply
      make mdio_devres.c part of phylib.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/27cba535-f507-4b32-84a3-0744c783a465@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
index a2d7300925a82f3419598c8d3c2727fee13dec19..bbef47c3480c591c287fd0fcdc0648b59a76193f 100644 (file)
--- a/drivers/net/ethernet/freescale/Kconfig
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -71,7 +71,6 @@ config FSL_XGMAC_MDIO
        tristate "Freescale XGMAC MDIO"
        select PHYLIB
        depends on OF
-       select MDIO_DEVRES
        select OF_MDIO
        help
          This driver supports the MDIO bus on the Fman 10G Ethernet MACs, and

diff --git a/drivers/net/ethernet/freescale/enetc/Kconfig b/drivers/net/ethernet/freescale/enetc/Kconfig
index 616ea22ceabc8ce3a8de61b8b17b9fec190ff26c..e917132d37149d7adc6d7441bffd8cc9c81de25e 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/Kconfig
+++ b/drivers/net/ethernet/freescale/enetc/Kconfig
@@ -25,7 +25,6 @@ config NXP_NETC_LIB
 config FSL_ENETC
        tristate "ENETC PF driver"
        depends on PCI_MSI
-       select MDIO_DEVRES
        select FSL_ENETC_CORE
        select FSL_ENETC_IERB
        select FSL_ENETC_MDIO
@@ -43,7 +42,6 @@ config FSL_ENETC
 config NXP_ENETC4
        tristate "ENETC4 PF driver"
        depends on PCI_MSI
-       select MDIO_DEVRES
        select FSL_ENETC_CORE
        select FSL_ENETC_MDIO
        select NXP_ENETC_PF_COMMON

diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index 837295fecd178abf33efc5dce2affa786e240868..50f7c59e8a04a0ac97edd03da52d8a4d94d9fa2f 100644 (file)
--- a/drivers/net/ethernet/marvell/Kconfig
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -34,7 +34,6 @@ config MV643XX_ETH
 config MVMDIO
        tristate "Marvell MDIO interface support"
        depends on HAS_IOMEM
-       select MDIO_DEVRES
        select PHYLIB
        help
          This driver supports the MDIO interface found in the network

diff --git a/drivers/net/ethernet/qualcomm/Kconfig b/drivers/net/ethernet/qualcomm/Kconfig
index 9210ff360fdce6adf1fbb64178a70a8cd675a736..a4434eb38950593f9471d2ac4c63634e8e02a256 100644 (file)
--- a/drivers/net/ethernet/qualcomm/Kconfig
+++ b/drivers/net/ethernet/qualcomm/Kconfig
@@ -52,7 +52,6 @@ config QCOM_EMAC
        depends on HAS_DMA && HAS_IOMEM
        select CRC32
        select PHYLIB
-       select MDIO_DEVRES
        help
          This driver supports the Qualcomm Technologies, Inc. Gigabit
          Ethernet Media Access Controller (EMAC). The controller

diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig
index 107236cd6bd949e6e5f044302beac32fa5f223b1..d3219ca194ec476f7c90b0862331c2461cea1e2d 100644 (file)
--- a/drivers/net/mdio/Kconfig
+++ b/drivers/net/mdio/Kconfig
@@ -38,9 +38,6 @@ config ACPI_MDIO
        help
          ACPI MDIO bus (Ethernet PHY) accessors
 
-config MDIO_DEVRES
-       tristate
-
 config MDIO_SUN4I
        tristate "Allwinner sun4i MDIO interface support"
        depends on ARCH_SUNXI || COMPILE_TEST
@@ -60,7 +57,6 @@ config MDIO_ASPEED
        tristate "ASPEED MDIO bus controller"
        depends on ARCH_ASPEED || COMPILE_TEST
        depends on OF_MDIO && HAS_IOMEM
-       select MDIO_DEVRES
        help
          This module provides a driver for the independent MDIO bus
          controllers found in the ASPEED AST2600 SoC. This is a driver for the
@@ -130,7 +126,6 @@ config MDIO_I2C
 config MDIO_MVUSB
        tristate "Marvell USB to MDIO Adapter"
        depends on USB
-       select MDIO_DEVRES
        help
          A USB to MDIO converter present on development boards for
          Marvell's Link Street family of Ethernet switches.
@@ -138,7 +133,6 @@ config MDIO_MVUSB
 config MDIO_MSCC_MIIM
        tristate "Microsemi MIIM interface support"
        depends on HAS_IOMEM && REGMAP_MMIO
-       select MDIO_DEVRES
        help
          This driver supports the MIIM (MDIO) interface found in the network
          switches of the Microsemi SoCs; it is recommended to switch on
@@ -156,7 +150,6 @@ config MDIO_OCTEON
        depends on (64BIT && OF_MDIO) || COMPILE_TEST
        depends on HAS_IOMEM
        select MDIO_CAVIUM
-       select MDIO_DEVRES
        help
          This module provides a driver for the Octeon and ThunderX MDIO
          buses. It is required by the Octeon and ThunderX ethernet device
@@ -166,7 +159,6 @@ config MDIO_IPQ4019
        tristate "Qualcomm IPQ4019 MDIO interface support"
        depends on HAS_IOMEM && OF_MDIO
        depends on COMMON_CLK
-       select MDIO_DEVRES
        help
          This driver supports the MDIO interface found in Qualcomm
          IPQ40xx, IPQ60xx, IPQ807x and IPQ50xx series Soc-s.
@@ -175,7 +167,6 @@ config MDIO_IPQ8064
        tristate "Qualcomm IPQ8064 MDIO interface support"
        depends on HAS_IOMEM && OF_MDIO
        depends on MFD_SYSCON
-       select MDIO_DEVRES
        help
          This driver supports the MDIO interface found in the network
          interface units of the IPQ8064 SoC
@@ -183,7 +174,6 @@ config MDIO_IPQ8064
 config MDIO_REALTEK_RTL9300
        tristate "Realtek RTL9300 MDIO interface support"
        depends on MACH_REALTEK_RTL || COMPILE_TEST
-       select MDIO_DEVRES
        help
          This driver supports the MDIO interface found in the Realtek
          RTL9300 family of Ethernet switches with integrated SoC.
@@ -204,7 +194,6 @@ config MDIO_THUNDER
        depends on 64BIT
        depends on PCI
        select MDIO_CAVIUM
-       select MDIO_DEVRES
        help
          This driver supports the MDIO interfaces found on Cavium
          ThunderX SoCs when the MDIO bus device appears as a PCI

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 0b8cc325e2bf856fb466717e22247067ba3a6e4e..677d56e065397e7089185c2db4136614e8739b02 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -15,7 +15,6 @@ config PHYLINK
 menuconfig PHYLIB
        tristate "PHY Device support and infrastructure"
        select MDIO_DEVICE
-       select MDIO_DEVRES
        help
          Ethernet controllers are usually attached to PHY
          devices.  This option provides infrastructure for

diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 631859d444518b32c29ddfd7cb444cda5744b779..59ac3a9a317788baa455b7ef27e26963bd8e129f 100644 (file)
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -20,7 +20,7 @@ obj-y                         += stubs.o
 else
 obj-$(CONFIG_MDIO_DEVICE)      += mdio-bus.o
 endif
-obj-$(CONFIG_MDIO_DEVRES)      += mdio_devres.o
+obj-$(CONFIG_PHYLIB)           += mdio_devres.o
 libphy-$(CONFIG_SWPHY)         += swphy.o
 libphy-$(CONFIG_LED_TRIGGER_PHY)       += phy_led_triggers.o
 libphy-$(CONFIG_OPEN_ALLIANCE_HELPERS) += open_alliance_helpers.o