diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-19 23:39:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-21 07:41:26 +0200 |
| commit | 1e60cbaf6364743d6d47fbd057aec4fa12ff21f4 (patch) | |
| tree | 22323017ae146dcd884c5ba2e718e632d12599db /drivers/usb/core/usb.c | |
| parent | 0339fe1d37eb9aca688981b49f3e44e87a7aaf87 (diff) | |
| download | barebox-1e60cbaf6364743d6d47fbd057aec4fa12ff21f4.tar.gz barebox-1e60cbaf6364743d6d47fbd057aec4fa12ff21f4.tar.xz | |
usb: rename USB devices to reflect bus structure
This renames the USB devices to reflect the bus structure.
The base name for a USB device is usb<devno>. For each child
device we add a -<parent-port-no>. This makes it more easy
to identify devices.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb/core/usb.c')
| -rw-r--r-- | drivers/usb/core/usb.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 9a0723a2ed..e232111410 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -431,14 +431,22 @@ static int usb_new_device(struct usb_device *dev) if (dev->descriptor->iSerialNumber) usb_string(dev, dev->descriptor->iSerialNumber, dev->serial, sizeof(dev->serial)); + + if (parent) { + sprintf(dev->dev.name, "%s-%d", parent->dev.name, port); + } else { + sprintf(dev->dev.name, "usb%d", dev->host->busnum); + } + + dev->dev.id = DEVICE_ID_SINGLE; + + register_device(&dev->dev); + /* now prode if the device is a hub */ usb_hub_probe(dev, 0); - sprintf(dev->dev.name, "usb%d-%d", dev->host->busnum, dev->devnum); - print_usb_device(dev); - register_device(&dev->dev); dev_add_param_int_ro(&dev->dev, "iManufacturer", dev->descriptor->iManufacturer, "%d"); dev_add_param_int_ro(&dev->dev, "iProduct", |