Skip to content

Commit

Permalink
net: bfin_mac: Use phy_find_first() instead of open-coding it
Browse files Browse the repository at this point in the history
Use phy_find_first() to find the first phy device instead of
open-coding it.

Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Guenter Roeck authored and David S. Miller committed Jan 11, 2016
1 parent 50ee638 commit 713d402
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions drivers/net/ethernet/adi/bfin_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,8 @@ static void bfin_mac_adjust_link(struct net_device *dev)
static int mii_probe(struct net_device *dev, int phy_mode)
{
struct bfin_mac_local *lp = netdev_priv(dev);
struct phy_device *phydev = NULL;
struct phy_device *phydev;
unsigned short sysctl;
int i;
u32 sclk, mdc_div;

/* Enable PHY output early */
Expand All @@ -396,19 +395,7 @@ static int mii_probe(struct net_device *dev, int phy_mode)
sysctl = (sysctl & ~MDCDIV) | SET_MDCDIV(mdc_div);
bfin_write_EMAC_SYSCTL(sysctl);

/* search for connected PHY device */
for (i = 0; i < PHY_MAX_ADDR; ++i) {
struct phy_device *const tmp_phydev =
mdiobus_get_phy(lp->mii_bus, i);

if (!tmp_phydev)
continue; /* no PHY here... */

phydev = tmp_phydev;
break; /* found it */
}

/* now we are supposed to have a proper phydev, to attach to... */
phydev = phy_find_first(lp->mii_bus);
if (!phydev) {
netdev_err(dev, "no phy device found\n");
return -ENODEV;
Expand Down

0 comments on commit 713d402

Please sign in to comment.