diff options
| author | kirjanov@gmail.com <kirjanov@gmail.com> | 2010-02-16 22:54:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-18 00:59:47 +0100 |
| commit | e4a474f82ddaaef65433b0b4f5169f2f6cd8ddb0 (patch) | |
| tree | b98db85ea6a829c6d4a94152e267c04ae9201be0 /drivers/net/smsc911x.c | |
| parent | net: bug fix for vlan + gro issue (diff) | |
| download | linux-e4a474f82ddaaef65433b0b4f5169f2f6cd8ddb0.tar.xz linux-e4a474f82ddaaef65433b0b4f5169f2f6cd8ddb0.zip | |
smsc911x: replace manual phy lookup.
Use phy_find_first() function instead of manual lookup.
Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smsc911x.c')
| -rw-r--r-- | drivers/net/smsc911x.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 3c1f9aa84cf5..13c0b76dec41 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c @@ -770,29 +770,25 @@ static int smsc911x_mii_probe(struct net_device *dev) { struct smsc911x_data *pdata = netdev_priv(dev); struct phy_device *phydev = NULL; - int phy_addr; + int ret; /* find the first phy */ - for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) { - if (pdata->mii_bus->phy_map[phy_addr]) { - phydev = pdata->mii_bus->phy_map[phy_addr]; - SMSC_TRACE(PROBE, "PHY %d: addr %d, phy_id 0x%08X", - phy_addr, phydev->addr, phydev->phy_id); - break; - } - } - + phydev = phy_find_first(pdata->mii_bus); if (!phydev) { pr_err("%s: no PHY found\n", dev->name); return -ENODEV; } - phydev = phy_connect(dev, dev_name(&phydev->dev), - &smsc911x_phy_adjust_link, 0, pdata->config.phy_interface); + SMSC_TRACE(PROBE, "PHY %d: addr %d, phy_id 0x%08X", + phy_addr, phydev->addr, phydev->phy_id); + + ret = phy_connect_direct(dev, phydev, + &smsc911x_phy_adjust_link, 0, + pdata->config.phy_interface); - if (IS_ERR(phydev)) { + if (ret) { pr_err("%s: Could not attach to PHY\n", dev->name); - return PTR_ERR(phydev); + return ret; } pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", |