diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-01-16 19:52:51 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-01-18 13:59:00 -0800 |
| commit | d8cce3a1bc539f7e928eb1d094a312089b146aa4 (patch) | |
| tree | cb0ecab071408278f52a4d827782dd8e38b8e603 | |
| parent | net: phy: remove state PHY_CHANGELINK (diff) | |
| download | linux-dev-d8cce3a1bc539f7e928eb1d094a312089b146aa4.tar.xz linux-dev-d8cce3a1bc539f7e928eb1d094a312089b146aa4.zip | |
net: phy: improve get_phy_id
Only caller of get_phy_id() is get_phy_device(). There a PHY ID of
0xffffffff is translated back to -ENODEV. So we can avoid some
overhead by returning -ENODEV directly.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/phy_device.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index ddb12f420940..3860dd85d097 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -773,15 +773,8 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id, /* Grab the bits from PHYIR1, and put them in the upper half */ phy_reg = mdiobus_read(bus, addr, MII_PHYSID1); if (phy_reg < 0) { - /* if there is no device, return without an error so scanning - * the bus works properly - */ - if (phy_reg == -EIO || phy_reg == -ENODEV) { - *phy_id = 0xffffffff; - return 0; - } - - return -EIO; + /* returning -ENODEV doesn't stop bus scanning */ + return (phy_reg == -EIO || phy_reg == -ENODEV) ? -ENODEV : -EIO; } *phy_id = (phy_reg & 0xffff) << 16; |