Commit 0031a06e authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



The bus_id field is going away, use the dev_set_name() function
to set it properly.

Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7071a3ce

drivers/usb/core/endpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int usb_create_ep_files(struct device *parent, 
	ep_dev->dev.class = ep_class->class;

	ep_dev->dev.parent = parent;

	ep_dev->dev.release = ep_device_release;

	snprintf(ep_dev->dev.bus_id, BUS_ID_SIZE, "usbdev%d.%d_ep%02x",

	dev_set_name(&ep_dev->dev, "usbdev%d.%d_ep%02x",

		 udev->bus->busnum, udev->devnum,

		 endpoint->desc.bEndpointAddress);

drivers/usb/core/message.c

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

	}

drivers/usb/core/usb.c

+2 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, 
		dev->devpath[0] = '0';



		dev->dev.parent = bus->controller;

		sprintf(&dev->dev.bus_id[0], "usb%d", bus->busnum);

		dev_set_name(&dev->dev, "usb%d", bus->busnum);

		root_hub = 1;

	} else {

		/* match any labeling on the hubs; it's one-based */
@@ -328,8 +328,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, 
				"%s.%d", parent->devpath, port1);



		dev->dev.parent = &parent->dev;

		sprintf(&dev->dev.bus_id[0], "%d-%s",

			bus->busnum, dev->devpath);

		dev_set_name(&dev->dev, "%d-%s", bus->busnum, dev->devpath);



		/* hub driver sets up TT records */

	}

drivers/usb/gadget/amd5536udc.c

+1 −1
Original line number Diff line number Diff line
@@ -3342,7 +3342,7 @@ static int udc_probe(struct udc *dev) 
	spin_lock_init(&dev->lock);

	dev->gadget.ops = &udc_ops;



	strcpy(dev->gadget.dev.bus_id, "gadget");

	dev_set_name(&dev->gadget.dev, "gadget");

	dev->gadget.dev.release = gadget_release;

	dev->gadget.name = name;

	dev->gadget.name = name;

drivers/usb/gadget/dummy_hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ static int dummy_udc_probe (struct platform_device *pdev) 
	/* maybe claim OTG support, though we won't complete HNP */

	dum->gadget.is_otg = (dummy_to_hcd(dum)->self.otg_port != 0);



	strcpy (dum->gadget.dev.bus_id, "gadget");

	dev_set_name(&dum->gadget.dev, "gadget");

	dum->gadget.dev.parent = &pdev->dev;

	dum->gadget.dev.release = dummy_gadget_release;

	rc = device_register (&dum->gadget.dev);