Commit 1a136ca2 authored by Andrew Lunn's avatar Andrew Lunn Committed by Paolo Abeni

net: mdio: scan bus based on bus capabilities for C22 and C45

Now that all MDIO bus drivers which set probe_capabilities to
MDIOBUS_C22_C45 have been converted to use the name API for C45
transactions, perform the scanning of the bus based on which methods
the bus provides.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 34865933
...@@ -711,9 +711,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) ...@@ -711,9 +711,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
goto error_reset_gpiod; goto error_reset_gpiod;
} }
if (bus->probe_capabilities == MDIOBUS_NO_CAP || if (bus->read) {
bus->probe_capabilities == MDIOBUS_C22 ||
bus->probe_capabilities == MDIOBUS_C22_C45) {
err = mdiobus_scan_bus_c22(bus); err = mdiobus_scan_bus_c22(bus);
if (err) if (err)
goto error; goto error;
...@@ -721,9 +719,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) ...@@ -721,9 +719,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
prevent_c45_scan = mdiobus_prevent_c45_scan(bus); prevent_c45_scan = mdiobus_prevent_c45_scan(bus);
if (!prevent_c45_scan && if (!prevent_c45_scan && bus->read_c45) {
(bus->probe_capabilities == MDIOBUS_C45 ||
bus->probe_capabilities == MDIOBUS_C22_C45)) {
err = mdiobus_scan_bus_c45(bus); err = mdiobus_scan_bus_c45(bus);
if (err) if (err)
goto error; goto error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment