Subject: linux-next: driver-core tree build failure

From: Stephen Rothwell <[email-masked]>
Date: Mon, 16 Mar 2009 20:47:03 +1100

Hi Greg,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/net/dnet.c: In function 'dnet_mii_probe':
drivers/net/dnet.c:283: error: 'struct device' has no member named 'bus_id'
drivers/net/dnet.c:287: error: 'struct device' has no member named 'bus_id'
drivers/net/dnet.c: In function 'dnet_probe':
drivers/net/dnet.c:928: error: 'struct device' has no member named 'bus_id'

Another new driver (in net-current) that needs conversion for then bus_id
removal.  I applied the patch below for today.

Dave, this could apply to net-current (or net after you merge
net-current) or Greg could put it in driver-core after net-current gets
merged into Linus' tree.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <[email-masked]>
Date: Mon, 16 Mar 2009 20:37:10 +1100
Subject: [PATCH] net: update dnet.c for bus_id removal

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/net/dnet.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 5c347f7..1b40632 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -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;
 
-- 
1.6.2