aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/au1000_eth.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-27 00:12:58 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-27 00:12:58 -0500
commitdb1d7bf70f42124f73675fca62fe32f3ab1111b4 (patch)
treefc6d52f9c898585ddaea22e2775267d3eb389617 /drivers/net/au1000_eth.c
parent3617aa485c7394e20fdaf356b1b78516fcaaa0d1 (diff)
net: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/au1000_eth.c')
-rw-r--r--drivers/net/au1000_eth.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 6d76ccb8e29..4274e4ac963 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -458,8 +458,8 @@ static int mii_probe (struct net_device *dev)
458 /* now we are supposed to have a proper phydev, to attach to... */ 458 /* now we are supposed to have a proper phydev, to attach to... */
459 BUG_ON(phydev->attached_dev); 459 BUG_ON(phydev->attached_dev);
460 460
461 phydev = phy_connect(dev, phydev->dev.bus_id, &au1000_adjust_link, 0, 461 phydev = phy_connect(dev, dev_name(&phydev->dev), &au1000_adjust_link,
462 PHY_INTERFACE_MODE_MII); 462 0, PHY_INTERFACE_MODE_MII);
463 463
464 if (IS_ERR(phydev)) { 464 if (IS_ERR(phydev)) {
465 printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); 465 printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
@@ -484,8 +484,8 @@ static int mii_probe (struct net_device *dev)
484 aup->phy_dev = phydev; 484 aup->phy_dev = phydev;
485 485
486 printk(KERN_INFO "%s: attached PHY driver [%s] " 486 printk(KERN_INFO "%s: attached PHY driver [%s] "
487 "(mii_bus:phy_addr=%s, irq=%d)\n", 487 "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name,
488 dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); 488 phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
489 489
490 return 0; 490 return 0;
491} 491}