diff options
| author |   Andrew Lunn <andrew@lunn.ch> | 2016-01-06 20:11:18 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-01-07 14:31:26 -0500 |
| commit | 7f854420fbfe9d49afe2ffb1df052cfe8e215541 (patch) | |
| tree | 1f3c8d932976b597cdb6db3e53b06b4a95c5d303 /drivers/net/ethernet/freescale/fec_main.c | |
| parent | of: phy: Only register a phy device for phys (diff) | |
| download | linux-dev-7f854420fbfe9d49afe2ffb1df052cfe8e215541.tar.xz linux-dev-7f854420fbfe9d49afe2ffb1df052cfe8e215541.zip | |
phy: Add API for {un}registering an mdio device to a bus.
Rather than have drivers directly manipulate the mii_bus structure,
provide and API for registering and unregistering devices on an MDIO
bus, and performing lookups.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fec_main.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index da255fb4f1d5..502da6f48f95 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -48,6 +48,7 @@ #include <linux/irq.h> #include <linux/clk.h> #include <linux/platform_device.h> +#include <linux/mdio.h> #include <linux/phy.h> #include <linux/fec.h> #include <linux/of.h> @@ -1926,11 +1927,7 @@ static int fec_enet_mii_probe(struct net_device *ndev) } else { /* check for attached phy */ for (phy_id = 0; (phy_id < PHY_MAX_ADDR); phy_id++) { - if ((fep->mii_bus->phy_mask & (1 << phy_id))) - continue; - if (fep->mii_bus->phy_map[phy_id] == NULL) - continue; - if (fep->mii_bus->phy_map[phy_id]->phy_id == 0) + if (!mdiobus_is_registered_device(fep->mii_bus, phy_id)) continue; if (dev_id--) continue; |