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

[linux-2.6-omap-h63xx.git] / drivers / usb / core / message.c

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index fe47d145255ae95f248dbe6825c9abc7836e1bb8..315363b744a3781ab86e5e3476e35061e89cd30c 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1090,7 +1090,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
                        if (!device_is_registered(&interface->dev))
                                continue;
                        dev_dbg(&dev->dev, "unregistering interface %s\n",
-                               interface->dev.bus_id);
+                               dev_name(&interface->dev));
                        device_del(&interface->dev);
                        usb_remove_sysfs_intf_files(interface);
                }
@@ -1611,7 +1611,7 @@ free_interfaces:
                intf->dev.dma_mask = dev->dev.dma_mask;
                device_initialize(&intf->dev);
                mark_quiesced(intf);
-               sprintf(&intf->dev.bus_id[0], "%d-%s:%d.%d",
+               dev_set_name(&intf->dev, "%d-%s:%d.%d",
                        dev->bus->busnum, dev->devpath,
                        configuration, alt->desc.bInterfaceNumber);
        }
@@ -1631,12 +1631,12 @@ free_interfaces:
 
                dev_dbg(&dev->dev,
                        "adding %s (config #%d, interface %d)\n",
-                       intf->dev.bus_id, configuration,
+                       dev_name(&intf->dev), configuration,
                        intf->cur_altsetting->desc.bInterfaceNumber);
                ret = device_add(&intf->dev);
                if (ret != 0) {
                        dev_err(&dev->dev, "device_add(%s) --> %d\n",
-                               intf->dev.bus_id, ret);
+                               dev_name(&intf->dev), ret);
                        continue;
                }
                usb_create_sysfs_intf_files(intf);