diff options
author | Marcin Wojtas <mw@semihalf.com> | 2021-06-25 12:38:53 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-06-25 11:46:29 -0700 |
commit | ac53c26433b51f1835ce5a935970e427d83e3ec5 (patch) | |
tree | cdbef2f33dc8a68365c9bbc569d49d330c743002 /drivers/net/mdio | |
parent | f92e1869d74e1acc6551256eb084a1c14a054e19 (diff) |
net: mdiobus: withdraw fwnode_mdbiobus_register
The newly implemented fwnode_mdbiobus_register turned out to be
problematic - in case the fwnode_/of_/acpi_mdio are built as
modules, a dependency cycle can be observed during the depmod phase of
modules_install, eg.:
depmod: ERROR: Cycle detected: fwnode_mdio -> of_mdio -> fwnode_mdio
depmod: ERROR: Found 2 modules in dependency cycles!
OR:
depmod: ERROR: Cycle detected: acpi_mdio -> fwnode_mdio -> acpi_mdio
depmod: ERROR: Found 2 modules in dependency cycles!
A possible solution could be to rework fwnode_mdiobus_register,
so that to merge the contents of acpi_mdiobus_register and
of_mdiobus_register. However feasible, such change would
be very intrusive and affect huge amount of the of_mdiobus_register
users.
Since there are currently 2 users of ACPI and MDIO
(xgmac_mdio and mvmdio), withdraw the fwnode_mdbiobus_register
and roll back to a simple 'if' condition in affected drivers.
Fixes: 62a6ef6a996f ("net: mdiobus: Introduce fwnode_mdbiobus_register()")
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mdio')
-rw-r--r-- | drivers/net/mdio/fwnode_mdio.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index ae0bf71a9932..1becb1a731f6 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -7,10 +7,8 @@ */ #include <linux/acpi.h> -#include <linux/acpi_mdio.h> #include <linux/fwnode_mdio.h> #include <linux/of.h> -#include <linux/of_mdio.h> #include <linux/phy.h> MODULE_AUTHOR("Calvin Johnson <calvin.johnson@oss.nxp.com>"); @@ -144,23 +142,3 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, return 0; } EXPORT_SYMBOL(fwnode_mdiobus_register_phy); - -/** - * fwnode_mdiobus_register - bring up all the PHYs on a given MDIO bus and - * attach them to it. - * @bus: Target MDIO bus. - * @fwnode: Pointer to fwnode of the MDIO controller. - * - * Return values are determined accordingly to acpi_/of_ mdiobus_register() - * operation. - */ -int fwnode_mdiobus_register(struct mii_bus *bus, struct fwnode_handle *fwnode) -{ - if (is_acpi_node(fwnode)) - return acpi_mdiobus_register(bus, fwnode); - else if (is_of_node(fwnode)) - return of_mdiobus_register(bus, to_of_node(fwnode)); - else - return -EINVAL; -} -EXPORT_SYMBOL(fwnode_mdiobus_register); |