diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-27 00:12:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-27 00:12:58 -0500 |
commit | db1d7bf70f42124f73675fca62fe32f3ab1111b4 (patch) | |
tree | fc6d52f9c898585ddaea22e2775267d3eb389617 /drivers/net/tc35815.c | |
parent | 3617aa485c7394e20fdaf356b1b78516fcaaa0d1 (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/tc35815.c')
-rw-r--r-- | drivers/net/tc35815.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index f42c67e93bf4..b52a1c088f37 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -725,7 +725,7 @@ static int tc_mii_probe(struct net_device *dev) | |||
725 | } | 725 | } |
726 | 726 | ||
727 | /* attach the mac to the phy */ | 727 | /* attach the mac to the phy */ |
728 | phydev = phy_connect(dev, phydev->dev.bus_id, | 728 | phydev = phy_connect(dev, dev_name(&phydev->dev), |
729 | &tc_handle_link_change, 0, | 729 | &tc_handle_link_change, 0, |
730 | lp->chiptype == TC35815_TX4939 ? | 730 | lp->chiptype == TC35815_TX4939 ? |
731 | PHY_INTERFACE_MODE_RMII : PHY_INTERFACE_MODE_MII); | 731 | PHY_INTERFACE_MODE_RMII : PHY_INTERFACE_MODE_MII); |
@@ -735,7 +735,7 @@ static int tc_mii_probe(struct net_device *dev) | |||
735 | } | 735 | } |
736 | printk(KERN_INFO "%s: attached PHY driver [%s] " | 736 | printk(KERN_INFO "%s: attached PHY driver [%s] " |
737 | "(mii_bus:phy_addr=%s, id=%x)\n", | 737 | "(mii_bus:phy_addr=%s, id=%x)\n", |
738 | dev->name, phydev->drv->name, phydev->dev.bus_id, | 738 | dev->name, phydev->drv->name, dev_name(&phydev->dev), |
739 | phydev->phy_id); | 739 | phydev->phy_id); |
740 | 740 | ||
741 | /* mask with MAC supported features */ | 741 | /* mask with MAC supported features */ |