Skip to content

Commit 73d9528

Browse files
hkallweitkuba-moo
authored andcommitted
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>
1 parent 0aa4024 commit 73d9528

File tree

7 files changed

+1
-18
lines changed

7 files changed

+1
-18
lines changed

drivers/net/ethernet/freescale/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ config FSL_XGMAC_MDIO
7171
tristate "Freescale XGMAC MDIO"
7272
select PHYLIB
7373
depends on OF
74-
select MDIO_DEVRES
7574
select OF_MDIO
7675
help
7776
This driver supports the MDIO bus on the Fman 10G Ethernet MACs, and

drivers/net/ethernet/freescale/enetc/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ config NXP_NETC_LIB
2525
config FSL_ENETC
2626
tristate "ENETC PF driver"
2727
depends on PCI_MSI
28-
select MDIO_DEVRES
2928
select FSL_ENETC_CORE
3029
select FSL_ENETC_IERB
3130
select FSL_ENETC_MDIO
@@ -43,7 +42,6 @@ config FSL_ENETC
4342
config NXP_ENETC4
4443
tristate "ENETC4 PF driver"
4544
depends on PCI_MSI
46-
select MDIO_DEVRES
4745
select FSL_ENETC_CORE
4846
select FSL_ENETC_MDIO
4947
select NXP_ENETC_PF_COMMON

drivers/net/ethernet/marvell/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ config MV643XX_ETH
3434
config MVMDIO
3535
tristate "Marvell MDIO interface support"
3636
depends on HAS_IOMEM
37-
select MDIO_DEVRES
3837
select PHYLIB
3938
help
4039
This driver supports the MDIO interface found in the network

drivers/net/ethernet/qualcomm/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ config QCOM_EMAC
5252
depends on HAS_DMA && HAS_IOMEM
5353
select CRC32
5454
select PHYLIB
55-
select MDIO_DEVRES
5655
help
5756
This driver supports the Qualcomm Technologies, Inc. Gigabit
5857
Ethernet Media Access Controller (EMAC). The controller

drivers/net/mdio/Kconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ config ACPI_MDIO
3838
help
3939
ACPI MDIO bus (Ethernet PHY) accessors
4040

41-
config MDIO_DEVRES
42-
tristate
43-
4441
config MDIO_SUN4I
4542
tristate "Allwinner sun4i MDIO interface support"
4643
depends on ARCH_SUNXI || COMPILE_TEST
@@ -60,7 +57,6 @@ config MDIO_ASPEED
6057
tristate "ASPEED MDIO bus controller"
6158
depends on ARCH_ASPEED || COMPILE_TEST
6259
depends on OF_MDIO && HAS_IOMEM
63-
select MDIO_DEVRES
6460
help
6561
This module provides a driver for the independent MDIO bus
6662
controllers found in the ASPEED AST2600 SoC. This is a driver for the
@@ -130,15 +126,13 @@ config MDIO_I2C
130126
config MDIO_MVUSB
131127
tristate "Marvell USB to MDIO Adapter"
132128
depends on USB
133-
select MDIO_DEVRES
134129
help
135130
A USB to MDIO converter present on development boards for
136131
Marvell's Link Street family of Ethernet switches.
137132

138133
config MDIO_MSCC_MIIM
139134
tristate "Microsemi MIIM interface support"
140135
depends on HAS_IOMEM && REGMAP_MMIO
141-
select MDIO_DEVRES
142136
help
143137
This driver supports the MIIM (MDIO) interface found in the network
144138
switches of the Microsemi SoCs; it is recommended to switch on
@@ -156,7 +150,6 @@ config MDIO_OCTEON
156150
depends on (64BIT && OF_MDIO) || COMPILE_TEST
157151
depends on HAS_IOMEM
158152
select MDIO_CAVIUM
159-
select MDIO_DEVRES
160153
help
161154
This module provides a driver for the Octeon and ThunderX MDIO
162155
buses. It is required by the Octeon and ThunderX ethernet device
@@ -166,7 +159,6 @@ config MDIO_IPQ4019
166159
tristate "Qualcomm IPQ4019 MDIO interface support"
167160
depends on HAS_IOMEM && OF_MDIO
168161
depends on COMMON_CLK
169-
select MDIO_DEVRES
170162
help
171163
This driver supports the MDIO interface found in Qualcomm
172164
IPQ40xx, IPQ60xx, IPQ807x and IPQ50xx series Soc-s.
@@ -175,15 +167,13 @@ config MDIO_IPQ8064
175167
tristate "Qualcomm IPQ8064 MDIO interface support"
176168
depends on HAS_IOMEM && OF_MDIO
177169
depends on MFD_SYSCON
178-
select MDIO_DEVRES
179170
help
180171
This driver supports the MDIO interface found in the network
181172
interface units of the IPQ8064 SoC
182173

183174
config MDIO_REALTEK_RTL9300
184175
tristate "Realtek RTL9300 MDIO interface support"
185176
depends on MACH_REALTEK_RTL || COMPILE_TEST
186-
select MDIO_DEVRES
187177
help
188178
This driver supports the MDIO interface found in the Realtek
189179
RTL9300 family of Ethernet switches with integrated SoC.
@@ -204,7 +194,6 @@ config MDIO_THUNDER
204194
depends on 64BIT
205195
depends on PCI
206196
select MDIO_CAVIUM
207-
select MDIO_DEVRES
208197
help
209198
This driver supports the MDIO interfaces found on Cavium
210199
ThunderX SoCs when the MDIO bus device appears as a PCI

drivers/net/phy/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ config PHYLINK
1515
menuconfig PHYLIB
1616
tristate "PHY Device support and infrastructure"
1717
select MDIO_DEVICE
18-
select MDIO_DEVRES
1918
help
2019
Ethernet controllers are usually attached to PHY
2120
devices. This option provides infrastructure for

drivers/net/phy/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ obj-y += stubs.o
2020
else
2121
obj-$(CONFIG_MDIO_DEVICE) += mdio-bus.o
2222
endif
23-
obj-$(CONFIG_MDIO_DEVRES) += mdio_devres.o
23+
obj-$(CONFIG_PHYLIB) += mdio_devres.o
2424
libphy-$(CONFIG_SWPHY) += swphy.o
2525
libphy-$(CONFIG_LED_TRIGGER_PHY) += phy_led_triggers.o
2626
libphy-$(CONFIG_OPEN_ALLIANCE_HELPERS) += open_alliance_helpers.o

0 commit comments

Comments
 (0)