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

The bus_id field is going away, use the dev_name() function instead.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

6 files changed, 15 insertions, 15 deletions

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 1e56f1cfa6dc..d0b37d776afe 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -586,7 +586,7 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
         struct usb_device *usb_dev;
 
         /* driver is often null here; dev_dbg() would oops */
-        pr_debug("usb %s: uevent\n", dev->bus_id);
+        pr_debug("usb %s: uevent\n", dev_name(dev));
 
         if (is_usb_device(dev))
                 usb_dev = to_usb_device(dev);
@@ -596,11 +596,11 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
         }
 
         if (usb_dev->devnum < 0) {
-                pr_debug("usb %s: already deleted?\n", dev->bus_id);
+                pr_debug("usb %s: already deleted?\n", dev_name(dev));
                 return -ENODEV;
         }
         if (!usb_dev->bus) {
-                pr_debug("usb %s: bus removed?\n", dev->bus_id);
+                pr_debug("usb %s: bus removed?\n", dev_name(dev));
                 return -ENODEV;
         }
 
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index fae55a31e26d..f600aec3fb3c 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -296,7 +296,7 @@ int usb_create_ep_files(struct device *parent,
         retval = endpoint_get_minor(ep_dev);
         if (retval) {
                 dev_err(parent, "can not allocate minor number for %s\n",
-                        ep_dev->dev.bus_id);
+                        dev_name(&ep_dev->dev));
                 goto error_register;
         }
 
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index c6a95395e52a..913fb8667899 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -150,7 +150,7 @@ int usb_register_dev(struct usb_interface *intf,
         int retval = -EINVAL;
         int minor_base = class_driver->minor_base;
         int minor = 0;
-        char name[BUS_ID_SIZE];
+        char name[20];
         char *temp;
 
 #ifdef CONFIG_USB_DYNAMIC_MINORS
@@ -190,9 +190,9 @@ int usb_register_dev(struct usb_interface *intf,
         intf->minor = minor;
 
         /* create a usb class device for this usb interface */
-        snprintf(name, BUS_ID_SIZE, class_driver->name, minor - minor_base);
+        snprintf(name, sizeof(name), class_driver->name, minor - minor_base);
         temp = strrchr(name, '/');
-        if (temp && (temp[1] != 0x00))
+        if (temp && (temp[1] != '\0'))
                 ++temp;
         else
                 temp = name;
@@ -227,7 +227,7 @@ void usb_deregister_dev(struct usb_interface *intf,
                         struct usb_class_driver *class_driver)
 {
         int minor_base = class_driver->minor_base;
-        char name[BUS_ID_SIZE];
+        char name[20];
 
 #ifdef CONFIG_USB_DYNAMIC_MINORS
         minor_base = 0;
@@ -242,7 +242,7 @@ void usb_deregister_dev(struct usb_interface *intf,
         usb_minors[intf->minor] = NULL;
         up_write(&minor_rwsem);
 
-        snprintf(name, BUS_ID_SIZE, class_driver->name, intf->minor - minor_base);
+        snprintf(name, sizeof(name), class_driver->name, intf->minor - minor_base);
         device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor));
         intf->usb_dev = NULL;
         intf->minor = -1;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 07f7bedf4dca..f7bfd72ef115 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -900,14 +900,14 @@ static int register_root_hub(struct usb_hcd *hcd)
         if (retval != sizeof usb_dev->descriptor) {
                 mutex_unlock(&usb_bus_list_lock);
                 dev_dbg (parent_dev, "can't read %s device descriptor %d\n",
-                                usb_dev->dev.bus_id, retval);
+                                dev_name(&usb_dev->dev), retval);
                 return (retval < 0) ? retval : -EMSGSIZE;
         }
 
         retval = usb_new_device (usb_dev);
         if (retval) {
                 dev_err (parent_dev, "can't register root hub for %s, %d\n",
-                                usb_dev->dev.bus_id, retval);
+                                dev_name(&usb_dev->dev), retval);
         }
         mutex_unlock(&usb_bus_list_lock);
 
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index fe47d145255a..1141a4918e88 100644
--- 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);
                 }
@@ -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);
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 325774375837..3aca6d5afcdf 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -308,7 +308,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
          * by location for diagnostics, tools, driver model, etc.  The
          * string is a path along hub ports, from the root.  Each device's
          * dev->devpath will be stable until USB is re-cabled, and hubs
-         * are often labeled with these port numbers.  The bus_id isn't
+         * are often labeled with these port numbers.  The name isn't
          * as stable:  bus->busnum changes easily from modprobe order,
          * cardbus or pci hotplugging, and so on.
          */