net: phy: Decide on C45 capabilities based on presence of method

Some PHYs provide invalid IDs in C22 space. If C45 is supported on the
bus an attempt can be made to get the IDs from the C45 space. Decide
on this based on the presence of the C45 read method in the bus
structure. This will allow the unreliable probe_capabilities to be
removed.

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/phy_device.c b/drivers/net/phy/phy_device.c
index 0d371a0a49f27588db2cc29157eb250fa8172396..9ba8f973f26fff87d6641311c9010f7e017482a2 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -946,7 +946,7 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
         * probe with C45 to see if we're able to get a valid PHY ID in the C45
         * space, if successful, create the C45 PHY device.
         */
-       if (!is_c45 && phy_id == 0 && bus->probe_capabilities >= MDIOBUS_C45) {
+       if (!is_c45 && phy_id == 0 && bus->read_c45) {
                r = get_phy_c45_ids(bus, addr, &c45_ids);
                if (!r)
                        return phy_device_create(bus, addr, phy_id,