net: phy: allow a PHY driver to define neither features nor get_features

Meanwhile we have generic functions for reading the abilities of
Clause 22 / 45 PHY's. This allows to use them as fallback in case
callback get_features isn't set. Benefit is the reduction of
boilerplate code in PHY drivers.

v2:
- adjust the comment in phy_driver_register to match the code

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 72fc714c9427c43b8832eda4f15954078c41cb71..f7a6d0ffb1acb90305cf1fffac61c7edb20d3638 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -2143,12 +2143,17 @@ static int phy_probe(struct device *dev)
         */
        if (phydrv->features) {
                linkmode_copy(phydev->supported, phydrv->features);
-       } else {
+       } else if (phydrv->get_features) {
                err = phydrv->get_features(phydev);
-               if (err)
-                       goto out;
+       } else if (phydev->is_c45) {
+               err = genphy_c45_pma_read_abilities(phydev);
+       } else {
+               err = genphy_read_abilities(phydev);
        }
 
+       if (err)
+               goto out;
+
        of_set_phy_supported(phydev);
        linkmode_copy(phydev->advertising, phydev->supported);
 
@@ -2216,11 +2221,11 @@ int phy_driver_register(struct phy_driver *new_driver, struct module *owner)
        int retval;
 
        /* Either the features are hard coded, or dynamically
-        * determine. It cannot be both or neither
+        * determined. It cannot be both.
         */
-       if (WARN_ON((!new_driver->features && !new_driver->get_features) ||
-                   (new_driver->features && new_driver->get_features))) {
-               pr_err("%s: Driver features are missing\n", new_driver->name);
+       if (WARN_ON(new_driver->features && new_driver->get_features)) {
+               pr_err("%s: features and get_features must not both be set\n",
+                      new_driver->name);
                return -EINVAL;
        }