Commit d8cce3a1 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e302c2a5

drivers/net/phy/phy_device.c

+2 −9
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE