Commit 7071a3ce authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 36aa8117

drivers/usb/core/driver.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

drivers/usb/core/endpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/usb/core/file.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

drivers/usb/core/hcd.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/usb/core/message.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 


		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);