[ar71xx] add experimental support for 2.6.30
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-2.6.30 / 802-ag71xx-use-dev-name-instead-of-bus-id.patch
1 --- a/drivers/net/ag71xx/ag71xx_ethtool.c
2 +++ b/drivers/net/ag71xx/ag71xx_ethtool.c
3 @@ -44,7 +44,7 @@ static void ag71xx_ethtool_get_drvinfo(s
4
5 strcpy(info->driver, ag->pdev->dev.driver->name);
6 strcpy(info->version, AG71XX_DRV_VERSION);
7 - strcpy(info->bus_info, ag->pdev->dev.bus_id);
8 + strcpy(info->bus_info, dev_name(&ag->pdev->dev));
9 }
10
11 static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)
12 --- a/drivers/net/ag71xx/ag71xx_phy.c
13 +++ b/drivers/net/ag71xx/ag71xx_phy.c
14 @@ -213,7 +213,7 @@ static int ag71xx_phy_connect_multi(stru
15
16 DBG("%s: PHY found at %s, uid=%08x\n",
17 dev->name,
18 - ag->mii_bus->phy_map[phy_addr]->dev.bus_id,
19 + dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),
20 ag->mii_bus->phy_map[phy_addr]->phy_id);
21
22 if (phydev == NULL)
23 @@ -229,12 +229,12 @@ static int ag71xx_phy_connect_multi(stru
24 ret = -ENODEV;
25 break;
26 case 1:
27 - ag->phy_dev = phy_connect(dev, phydev->dev.bus_id,
28 + ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),
29 &ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);
30
31 if (IS_ERR(ag->phy_dev)) {
32 printk(KERN_ERR "%s: could not connect to PHY at %s\n",
33 - dev->name, phydev->dev.bus_id);
34 + dev->name, dev_name(&phydev->dev));
35 return PTR_ERR(ag->phy_dev);
36 }
37
38 @@ -248,7 +248,7 @@ static int ag71xx_phy_connect_multi(stru
39
40 printk(KERN_DEBUG "%s: connected to PHY at %s "
41 "[uid=%08x, driver=%s]\n",
42 - dev->name, phydev->dev.bus_id,
43 + dev->name, dev_name(&phydev->dev),
44 phydev->phy_id, phydev->drv->name);
45
46 ag->link = 0;