forked from Minki/linux
net: update dnet.c for bus_id removal
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4b97926ddf
commit
6580f57d48
|
@ -280,11 +280,11 @@ static int dnet_mii_probe(struct net_device *dev)
|
||||||
|
|
||||||
/* attach the mac to the phy */
|
/* attach the mac to the phy */
|
||||||
if (bp->capabilities & DNET_HAS_RMII) {
|
if (bp->capabilities & DNET_HAS_RMII) {
|
||||||
phydev = phy_connect(dev, phydev->dev.bus_id,
|
phydev = phy_connect(dev, dev_name(&phydev->dev),
|
||||||
&dnet_handle_link_change, 0,
|
&dnet_handle_link_change, 0,
|
||||||
PHY_INTERFACE_MODE_RMII);
|
PHY_INTERFACE_MODE_RMII);
|
||||||
} else {
|
} else {
|
||||||
phydev = phy_connect(dev, phydev->dev.bus_id,
|
phydev = phy_connect(dev, dev_name(&phydev->dev),
|
||||||
&dnet_handle_link_change, 0,
|
&dnet_handle_link_change, 0,
|
||||||
PHY_INTERFACE_MODE_MII);
|
PHY_INTERFACE_MODE_MII);
|
||||||
}
|
}
|
||||||
|
@ -927,7 +927,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
|
||||||
phydev = bp->phy_dev;
|
phydev = bp->phy_dev;
|
||||||
dev_info(&pdev->dev, "attached PHY driver [%s] "
|
dev_info(&pdev->dev, "attached PHY driver [%s] "
|
||||||
"(mii_bus:phy_addr=%s, irq=%d)\n",
|
"(mii_bus:phy_addr=%s, irq=%d)\n",
|
||||||
phydev->drv->name, phydev->dev.bus_id, phydev->irq);
|
phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user