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: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index a664eeb1868d683cc12c251a8f6b6d5b932c7411..5b2f48c09a6a2c4c8a10c656d3c340245dc43a68 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -711,9 +711,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
                        goto error_reset_gpiod;
        }
 
-       if (bus->probe_capabilities == MDIOBUS_NO_CAP ||
-           bus->probe_capabilities == MDIOBUS_C22 ||
-           bus->probe_capabilities == MDIOBUS_C22_C45) {
+       if (bus->read) {
                err = mdiobus_scan_bus_c22(bus);
                if (err)
                        goto error;
@@ -721,9 +719,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
 
        prevent_c45_scan = mdiobus_prevent_c45_scan(bus);
 
-       if (!prevent_c45_scan &&
-           (bus->probe_capabilities == MDIOBUS_C45 ||
-            bus->probe_capabilities == MDIOBUS_C22_C45)) {
+       if (!prevent_c45_scan && bus->read_c45) {
                err = mdiobus_scan_bus_c45(bus);
                if (err)
                        goto error;