[PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch

From: Arnd Bergmann
Date: Wed Jul 21 2021 - 11:04:17 EST

From: Arnd Bergmann <arnd@xxxxxxxx>

There are two conflicting patches in net-next, one removed
the at803x_get_features() function and the other added another

drivers/net/phy/at803x.c: In function 'at803x_get_features':
drivers/net/phy/at803x.c:706:14: error: implicit declaration of function 'at803x_match_phy_id' [-Werror=implicit-function-declaration]

Change the new caller over to an open-coded comparison as well.

Fixes: 8887ca5474bd ("net: phy: at803x: simplify custom phy id matching")
Fixes: b856150c8098 ("net: phy: at803x: mask 1000 Base-X link mode")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
drivers/net/phy/at803x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 0790ffcd3db6..bdac087058b2 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -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