A function should either return an ERR_PTR or NULL on failure, but not both. Let get_phy_device() return an ERR_PTR and fix the return checks in mdiobus_scan and phy_device_connect.
Signed-off-by: Sascha Hauer <[email protected]> --- drivers/net/phy/mdio_bus.c | 2 +- drivers/net/phy/phy.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 6163a50..87072be 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -82,7 +82,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) return bus->phy_map[addr]; phydev = get_phy_device(bus, addr); - if (IS_ERR(phydev) || phydev == NULL) + if (IS_ERR(phydev)) return phydev; bus->phy_map[addr] = phydev; diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index db00e38..2a33054 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -217,7 +217,7 @@ struct phy_device *get_phy_device(struct mii_bus *bus, int addr) /* If the phy_id is mostly Fs, there is no device there */ if ((phy_id & 0x1fffffff) == 0x1fffffff) - return NULL; + return ERR_PTR(-ENODEV); dev = phy_device_create(bus, addr, phy_id); @@ -254,7 +254,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr, if (!edev->phydev) { if (addr >= 0) { dev = mdiobus_scan(bus, addr); - if (!dev) { + if (IS_ERR(dev)) { ret = -EIO; goto fail; } @@ -273,7 +273,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr, continue; dev = mdiobus_scan(bus, i); - if (!dev || dev->attached_dev) + if (IS_ERR(dev) || dev->attached_dev) continue; dev->attached_dev = edev; @@ -304,7 +304,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr, return 0; fail: - if (dev) + if (!IS_ERR(dev)) dev->attached_dev = NULL; puts("Unable to find a PHY (unknown ID?)\n"); return ret; -- 1.8.4.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
