Commit ee64f08e authored Jan 10, 2016 by Guenter Roeck Committed by David S. Miller Jan 10, 2016

net: ethernet: broadcom: Fix build errors



Commit 7f854420 ("phy: Add API for {un}registering an mdio device to
a bus") introduces an API to access mii_bus structures, but missed to
update the sb1250 driver. This results in the following build error.

drivers/net/ethernet/broadcom/sb1250-mac.c: In function 'sbmac_mii_probe':
drivers/net/ethernet/broadcom/sb1250-mac.c:2360:24: error:
	'struct mii_bus' has no member named 'phy_map'

Use phy_find_first() instead of open coding it.

Commit 2220943a ("phy: Centralise print about attached phy") introduces
the following build error.

drivers/net/ethernet/broadcom/sb1250-mac.c: In function 'sbmac_mii_probe':
drivers/net/ethernet/broadcom/sb1250-mac.c:2383:20: error: 'phydev' undeclared

Fixes: 7f854420 ("phy: Add API for {un}registering an mdio device to a bus")
Fixes: 2220943a ("phy: Centralise print about attached phy")
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5c721d56

drivers/net/ethernet/broadcom/sb1250-mac.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -2354,13 +2354,8 @@ static int sbmac_mii_probe(struct net_device *dev)
		{
		struct sbmac_softc *sc = netdev_priv(dev);
		struct phy_device *phy_dev;
		int i;

		for (i = 0; i < PHY_MAX_ADDR; i++) {
		phy_dev = sc->mii_bus->phy_map[i];
		if (phy_dev)
		break;
		}
		phy_dev = phy_find_first(sc->mii_bus);
		if (!phy_dev) {
		printk(KERN_ERR "%s: no PHY found\n", dev->name);
		return -ENXIO;
		@@ -2385,7 +2380,7 @@ static int sbmac_mii_probe(struct net_device *dev)
		SUPPORTED_Pause \|
		SUPPORTED_Asym_Pause;

		phy_attached_info(phydev);
		phy_attached_info(phy_dev);

		phy_dev->advertising = phy_dev->supported;