[ar71xx] use dev_name() instead of bus_id in ag71xx, ohci-ar71xx, ehci-ar71xx drivers

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15629 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 12 insertions, 117 deletions

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ethtool.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ethtool.c
index 878be77c9..3ac347f6b 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ethtool.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ethtool.c
@@ -44,7 +44,7 @@ static void ag71xx_ethtool_get_drvinfo(struct net_device *dev,
 
 	strcpy(info->driver, ag->pdev->dev.driver->name);
 	strcpy(info->version, AG71XX_DRV_VERSION);
-	strcpy(info->bus_info, ag->pdev->dev.bus_id);
+	strcpy(info->bus_info, dev_name(&ag->pdev->dev));
 }
 
 static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
index 029d8eeb5..ab76a4841 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
@@ -217,7 +217,7 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
 
 		DBG("%s: PHY found at %s, uid=%08x\n",
 			dev->name,
-			ag->mii_bus->phy_map[phy_addr]->dev.bus_id,
+			dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),
 			ag->mii_bus->phy_map[phy_addr]->phy_id);
 
 		if (phydev == NULL)
@@ -233,12 +233,12 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
 		ret = -ENODEV;
 		break;
 	case 1:
-		ag->phy_dev = phy_connect(dev, phydev->dev.bus_id,
+		ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),
 			&ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);
 
 		if (IS_ERR(ag->phy_dev)) {
 			printk(KERN_ERR "%s: could not connect to PHY at %s\n",
-				dev->name, phydev->dev.bus_id);
+				dev->name, dev_name(&phydev->dev));
 			return PTR_ERR(ag->phy_dev);
 		}
 
@@ -252,7 +252,7 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
 
 		printk(KERN_DEBUG "%s: connected to PHY at %s "
 			"[uid=%08x, driver=%s]\n",
-			dev->name, phydev->dev.bus_id,
+			dev->name, dev_name(&phydev->dev),
 			phydev->phy_id, phydev->drv->name);
 
 		ag->link = 0;
diff --git a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c
index 1c05a64c5..5b929e1db 100644
--- a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c
+++ b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c
@@ -79,7 +79,7 @@ static int ehci_ar71xx_probe(const struct hc_driver *driver,
 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 	if (!res) {
 		dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
-			pdev->dev.bus_id);
+			dev_name(&pdev->dev));
 		return -ENODEV;
 	}
 	irq = res->start;
@@ -87,11 +87,11 @@ static int ehci_ar71xx_probe(const struct hc_driver *driver,
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_dbg(&pdev->dev, "no base address specified for %s\n",
-			pdev->dev.bus_id);
+			dev_name(&pdev->dev));
 		return -ENODEV;
 	}
 
-	hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
+	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
 	if (!hcd)
 		return -ENOMEM;
 
@@ -205,7 +205,7 @@ static int ehci_ar71xx_driver_probe(struct platform_device *pdev)
 	pdata = pdev->dev.platform_data;
 	if (!pdata) {
 		dev_err(&pdev->dev, "no platform data specified for %s\n",
-			pdev->dev.bus_id);
+			dev_name(&pdev->dev));
 		return -ENODEV;
 	}
 
diff --git a/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c b/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c
index 30fb9e039..48457e013 100644
--- a/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c
+++ b/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c
@@ -30,19 +30,19 @@ static int usb_hcd_ar71xx_probe(const struct hc_driver *driver,
 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 	if (!res) {
 		dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
-			pdev->dev.bus_id);
+			dev_name(&pdev->dev));
 		return -ENODEV;
 	}
 	irq = res->start;
 
-	hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
+	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
 	if (!hcd)
 		return -ENOMEM;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_dbg(&pdev->dev, "no base address specified for %s\n",
-			pdev->dev.bus_id);
+			dev_name(&pdev->dev));
 		ret = -ENODEV;
 		goto err_put_hcd;
 	}
diff --git a/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-dev-name-instead-of-bus-id.patch b/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-dev-name-instead-of-bus-id.patch
deleted file mode 100644
index d85cc1169..000000000
--- a/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-dev-name-instead-of-bus-id.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/drivers/net/ag71xx/ag71xx_ethtool.c
-+++ b/drivers/net/ag71xx/ag71xx_ethtool.c
-@@ -44,7 +44,7 @@ static void ag71xx_ethtool_get_drvinfo(s
- 
- 	strcpy(info->driver, ag->pdev->dev.driver->name);
- 	strcpy(info->version, AG71XX_DRV_VERSION);
--	strcpy(info->bus_info, ag->pdev->dev.bus_id);
-+	strcpy(info->bus_info, dev_name(&ag->pdev->dev));
- }
- 
- static u32 ag71xx_ethtool_get_msglevel(struct net_device *dev)
---- a/drivers/net/ag71xx/ag71xx_phy.c
-+++ b/drivers/net/ag71xx/ag71xx_phy.c
-@@ -213,7 +213,7 @@ static int ag71xx_phy_connect_multi(stru
- 
- 		DBG("%s: PHY found at %s, uid=%08x\n",
- 			dev->name,
--			ag->mii_bus->phy_map[phy_addr]->dev.bus_id,
-+			dev_name(&ag->mii_bus->phy_map[phy_addr]->dev),
- 			ag->mii_bus->phy_map[phy_addr]->phy_id);
- 
- 		if (phydev == NULL)
-@@ -229,12 +229,12 @@ static int ag71xx_phy_connect_multi(stru
- 		ret = -ENODEV;
- 		break;
- 	case 1:
--		ag->phy_dev = phy_connect(dev, phydev->dev.bus_id,
-+		ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev),
- 			&ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);
- 
- 		if (IS_ERR(ag->phy_dev)) {
- 			printk(KERN_ERR "%s: could not connect to PHY at %s\n",
--				dev->name, phydev->dev.bus_id);
-+				dev->name, dev_name(&phydev->dev));
- 			return PTR_ERR(ag->phy_dev);
- 		}
- 
-@@ -248,7 +248,7 @@ static int ag71xx_phy_connect_multi(stru
- 
- 		printk(KERN_DEBUG "%s: connected to PHY at %s "
- 			"[uid=%08x, driver=%s]\n",
--			dev->name, phydev->dev.bus_id,
-+			dev->name, dev_name(&phydev->dev),
- 			phydev->phy_id, phydev->drv->name);
- 
- 		ag->link = 0;
diff --git a/target/linux/ar71xx/patches-2.6.30/810-ehci-ar71xx-use-dev-name-instead-of-bus-id.patch b/target/linux/ar71xx/patches-2.6.30/810-ehci-ar71xx-use-dev-name-instead-of-bus-id.patch
deleted file mode 100644
index 131029f38..000000000
--- a/target/linux/ar71xx/patches-2.6.30/810-ehci-ar71xx-use-dev-name-instead-of-bus-id.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/drivers/usb/host/ehci-ar71xx.c
-+++ b/drivers/usb/host/ehci-ar71xx.c
-@@ -79,7 +79,7 @@ static int ehci_ar71xx_probe(const struc
- 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
- 	if (!res) {
- 		dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
--			pdev->dev.bus_id);
-+			dev_name(&pdev->dev));
- 		return -ENODEV;
- 	}
- 	irq = res->start;
-@@ -87,11 +87,11 @@ static int ehci_ar71xx_probe(const struc
- 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- 	if (!res) {
- 		dev_dbg(&pdev->dev, "no base address specified for %s\n",
--			pdev->dev.bus_id);
-+			dev_name(&pdev->dev));
- 		return -ENODEV;
- 	}
- 
--	hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
-+	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
- 	if (!hcd)
- 		return -ENOMEM;
- 
-@@ -205,7 +205,7 @@ static int ehci_ar71xx_driver_probe(stru
- 	pdata = pdev->dev.platform_data;
- 	if (!pdata) {
- 		dev_err(&pdev->dev, "no platform data specified for %s\n",
--			pdev->dev.bus_id);
-+			dev_name(&pdev->dev));
- 		return -ENODEV;
- 	}
- 
diff --git a/target/linux/ar71xx/patches-2.6.30/811-ohci-ar71xx-use-dev-name-instead-of-bus-id.patch b/target/linux/ar71xx/patches-2.6.30/811-ohci-ar71xx-use-dev-name-instead-of-bus-id.patch
deleted file mode 100644
index 4660bc155..000000000
--- a/target/linux/ar71xx/patches-2.6.30/811-ohci-ar71xx-use-dev-name-instead-of-bus-id.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/usb/host/ohci-ar71xx.c
-+++ b/drivers/usb/host/ohci-ar71xx.c
-@@ -30,19 +30,19 @@ static int usb_hcd_ar71xx_probe(const st
- 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
- 	if (!res) {
- 		dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
--			pdev->dev.bus_id);
-+			dev_name(&pdev->dev));
- 		return -ENODEV;
- 	}
- 	irq = res->start;
- 
--	hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id);
-+	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
- 	if (!hcd)
- 		return -ENOMEM;
- 
- 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- 	if (!res) {
- 		dev_dbg(&pdev->dev, "no base address specified for %s\n",
--			pdev->dev.bus_id);
-+			dev_name(&pdev->dev));
- 		ret = -ENODEV;
- 		goto err_put_hcd;
- 	}