]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
net: update dnet.c for bus_id removal
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 23 Mar 2009 04:22:48 +0000 (21:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Mar 2009 04:22:48 +0000 (21:22 -0700)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dnet.c

index 5c347f70cb6726fda8078aec5b0c4827f2b2e346..1b4063222a82dd010dcbd9944a4e005438636ba0 100644 (file)
@@ -280,11 +280,11 @@ static int dnet_mii_probe(struct net_device *dev)
 
        /* attach the mac to the phy */
        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,
                                     PHY_INTERFACE_MODE_RMII);
        } else {
-               phydev = phy_connect(dev, phydev->dev.bus_id,
+               phydev = phy_connect(dev, dev_name(&phydev->dev),
                                     &dnet_handle_link_change, 0,
                                     PHY_INTERFACE_MODE_MII);
        }
@@ -927,7 +927,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
        phydev = bp->phy_dev;
        dev_info(&pdev->dev, "attached PHY driver [%s] "
               "(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;