net: phy: at803x: finish the phy id checking simplification
authorVladimir Oltean <vladimir.oltean@nxp.com>
Tue, 20 Jul 2021 17:24:33 +0000 (20:24 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Jul 2021 14:58:20 +0000 (07:58 -0700)
The blamed commit was probably not tested on net-next, since it did not
refactor the extra phy id check introduced in commit b856150c8098 ("net:
phy: at803x: mask 1000 Base-X link mode").

Fixes: 8887ca5474bd ("net: phy: at803x: simplify custom phy id matching")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/at803x.c

index 0790ffc..bdac087 100644 (file)
@@ -703,7 +703,7 @@ static int at803x_get_features(struct phy_device *phydev)
        if (err)
                return err;
 
-       if (!at803x_match_phy_id(phydev, ATH8031_PHY_ID))
+       if (phydev->drv->phy_id != ATH8031_PHY_ID)
                return 0;
 
        /* AR8031/AR8033 have different status registers