USB: usb dev_name() instead of dev->bus_id

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ehci-ixp4xx.c

diff --git a/drivers/usb/host/ehci-ixp4xx.c b/drivers/usb/host/ehci-ixp4xx.c
index 9d042f220097c874286e5e2322fc7367418a3361..f9575c4091240ef364a4ca0b2d1bfac5099ccf25 100644 (file)
--- a/drivers/usb/host/ehci-ixp4xx.c
+++ b/drivers/usb/host/ehci-ixp4xx.c
@@ -77,12 +77,12 @@ static int ixp4xx_ehci_probe(struct platform_device *pdev)
        if (!res) {
                dev_err(&pdev->dev,
                        "Found HC with no IRQ. Check %s setup!\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) {
                retval = -ENOMEM;
                goto fail_create_hcd;
@@ -92,7 +92,7 @@ static int ixp4xx_ehci_probe(struct platform_device *pdev)
        if (!res) {
                dev_err(&pdev->dev,
                        "Found HC with no register addr. Check %s setup!\n",
-                       pdev->dev.bus_id);
+                       dev_name(&pdev->dev));
                retval = -ENODEV;
                goto fail_request_resource;
        }
@@ -126,7 +126,7 @@ fail_ioremap:
 fail_request_resource:
        usb_put_hcd(hcd);
 fail_create_hcd:
-       dev_err(&pdev->dev, "init %s fail, %d\n", pdev->dev.bus_id, retval);
+       dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), retval);
        return retval;
 }