[PATCH] USB: remove all struct device.name usage from the USB code.

This is because that field is going away shortly...

diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index a0705e7d7ac909aa79305fc777061c1f3118c961..59509c6749fe392d87715ffc51b65244b17a6769 100644 (file)
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -147,7 +147,8 @@ clean_2:
        hcd->description = driver->description;
        hcd->pdev = dev;
        hcd->self.bus_name = pci_name(dev);
-       hcd->product_desc = dev->dev.name;
+       if (hcd->product_desc == NULL)
+               hcd->product_desc = "USB Host Controller";
        hcd->self.controller = &dev->dev;
        hcd->controller = hcd->self.controller;
 

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index af67d61db671322e5854783a58008a0aefd8700e..b4ba5ed859d70d659c9e11552a7b1541f54d4d3e 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -597,10 +597,8 @@ descriptor_error:
 
        usb_set_intfdata (intf, hub);
 
-       if (hub_configure(hub, endpoint) >= 0) {
-               strcpy (intf->dev.name, "Hub");
+       if (hub_configure(hub, endpoint) >= 0)
                return 0;
-       }
 
        hub_disconnect (intf);
        return -ENODEV;

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 85bdd3fe8642ec81cb9847af38a1c9cff053d149..e9e0b677822f4ffdb015de1aa86b3c9740ac42e3 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -978,68 +978,6 @@ int usb_set_address(struct usb_device *dev)
        return retval;
 }
 
-
-/* improve on the default device description, if we can ... and
- * while we're at it, maybe show the vendor and product strings.
- */
-static void set_device_description (struct usb_device *dev)
-{
-       void    *buf;
-       int     mfgr = dev->descriptor.iManufacturer;
-       int     prod = dev->descriptor.iProduct;
-       int     vendor_id = dev->descriptor.idVendor;
-       int     product_id = dev->descriptor.idProduct;
-       char    *mfgr_str, *prod_str;
-
-       /* set default; keep it if there are no strings, or kmalloc fails */
-       sprintf (dev->dev.name, "USB device %04x:%04x",
-                vendor_id, product_id);
-
-       if (!(buf = kmalloc(256 * 2, GFP_KERNEL)))
-               return;
-       
-       prod_str = (char *) buf;
-       mfgr_str = (char *) buf + 256;
-
-       if (prod && usb_string (dev, prod, prod_str, 256) > 0) {
-#ifdef DEBUG
-               dev_printk (KERN_INFO, &dev->dev, "Product: %s\n", prod_str);
-#endif
-       } else {
-               prod_str = 0;
-       }
-
-       if (mfgr && usb_string (dev, mfgr, mfgr_str, 256) > 0) {
-#ifdef DEBUG
-               dev_printk (KERN_INFO, &dev->dev, "Manufacturer: %s\n", mfgr_str);
-#endif
-       } else {
-               mfgr_str = 0;
-       }
-
-       /* much like pci ... describe as either:
-        * - both strings:   'product descr (vendor descr)'
-        * - product only:   'product descr (USB device vvvv:pppp)'
-        * - vendor only:    'USB device vvvv:pppp (vendor descr)'
-        * - neither string: 'USB device vvvv:pppp'
-        */
-
-       if (prod_str && mfgr_str) {
-               snprintf(dev->dev.name, sizeof dev->dev.name,
-                        "%s (%s)", prod_str, mfgr_str);
-       } else if (prod_str) {
-               snprintf(dev->dev.name, sizeof dev->dev.name,
-                        "%s (USB device %04x:%04x)",
-                        prod_str, vendor_id, product_id);
-       } else if (mfgr_str) {
-               snprintf(dev->dev.name, sizeof dev->dev.name,
-                        "USB device %04x:%04x (%s)",
-                        vendor_id, product_id, mfgr_str);
-       }
-
-       kfree(buf);
-}
-
 /*
  * By the time we get here, we chose a new device address
  * and is in the default state. We need to identify the thing and
@@ -1181,9 +1119,12 @@ int usb_new_device(struct usb_device *dev, struct device *parent)
 
        dev_dbg(&dev->dev, "new device strings: Mfr=%d, Product=%d, SerialNumber=%d\n",
                dev->descriptor.iManufacturer, dev->descriptor.iProduct, dev->descriptor.iSerialNumber);
-       set_device_description (dev);
 
 #ifdef DEBUG
+       if (dev->descriptor.iProduct)
+               usb_show_string(dev, "Product", dev->descriptor.iProduct);
+       if (dev->descriptor.iManufacturer)
+               usb_show_string(dev, "Manufacturer", dev->descriptor.iManufacturer);
        if (dev->descriptor.iSerialNumber)
                usb_show_string(dev, "SerialNumber", dev->descriptor.iSerialNumber);
 #endif
@@ -1208,20 +1149,6 @@ int usb_new_device(struct usb_device *dev, struct device *parent)
                sprintf (&interface->dev.bus_id[0], "%d-%s:%d",
                         dev->bus->busnum, dev->devpath,
                         desc->bInterfaceNumber);
-               if (!desc->iInterface
-                               || usb_string (dev, desc->iInterface,
-                                       interface->dev.name,
-                                       sizeof interface->dev.name) <= 0) {
-                       /* typically devices won't bother with interface
-                        * descriptions; this is the normal case.  an
-                        * interface's driver might describe it better.
-                        * (also: iInterface is per-altsetting ...)
-                        */
-                       sprintf (&interface->dev.name[0],
-                               "usb-%s-%s interface %d",
-                               dev->bus->bus_name, dev->devpath,
-                               desc->bInterfaceNumber);
-               }
                dev_dbg (&dev->dev, "%s - registering interface %s\n", __FUNCTION__, interface->dev.bus_id);
                device_add (&interface->dev);
                usb_create_driverfs_intf_files (interface);

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 8d6e3bb67a3f30b74a361653673b685bd6ff411d..ab7b4a53568aaa1975457a2135f62e0725f7bbf3 100644 (file)
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -591,8 +591,8 @@ show_registers (struct class_device *class_dev, char *buf)
        /* Capability Registers */
        i = readw (&ehci->caps->hci_version);
        temp = snprintf (next, size,
-               "%s\nEHCI %x.%02x, hcd state %d (driver " DRIVER_VERSION ")\n",
-               hcd->pdev->dev.name,
+               "PCI device %s\nEHCI %x.%02x, hcd state %d (driver " DRIVER_VERSION ")\n",
+               pci_name(hcd->pdev),
                i >> 8, i & 0x0ff, ehci->hcd.state);
        size -= temp;
        next += temp;

diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c
index 8f3f2c128a76fa70f9f68c8fc1f0f280b229c7c9..65f8ab8c82559ed94537eff72d1feba3124074b4 100644 (file)
--- a/drivers/usb/host/ehci-mem.c
+++ b/drivers/usb/host/ehci-mem.c
@@ -44,6 +44,7 @@ static struct usb_hcd *ehci_hcd_alloc (void)
                kmalloc (sizeof (struct ehci_hcd), GFP_KERNEL);
        if (ehci != 0) {
                memset (ehci, 0, sizeof (struct ehci_hcd));
+               ehci->hcd.product_desc = "EHCI Host Controller";
                return &ehci->hcd;
        }
        return 0;

diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c
index 4fc839304cec8ec1d55a6cf7fd293963bbb5b5a8..c062c0637a9604fb42004d373255bbfa330f059f 100644 (file)
--- a/drivers/usb/host/ohci-mem.c
+++ b/drivers/usb/host/ohci-mem.c
@@ -30,6 +30,7 @@ static struct usb_hcd *ohci_hcd_alloc (void)
        ohci = (struct ohci_hcd *) kmalloc (sizeof *ohci, GFP_KERNEL);
        if (ohci != 0) {
                memset (ohci, 0, sizeof (struct ohci_hcd));
+               ohci->hcd.product_desc = "OHCI Host Controller";
                return &ohci->hcd;
        }
        return 0;

diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 561e686c142977b0621bffbec687dd74bd62f08a..bd60660986820b8826833f031751d0ed89f5bda4 100644 (file)
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -2460,6 +2460,7 @@ static struct usb_hcd *uhci_hcd_alloc(void)
                return NULL;
 
        memset(uhci, 0, sizeof(*uhci));
+       uhci->hcd.product_desc = "UHCI Host Controller";
        return &uhci->hcd;
 }
 

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8fc39c99089a508ca9f72d5b98e5440d780e7aa2..4a2721f5d1fa527cfdb3cd6a5f429aa53eb4fce6 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1238,7 +1238,6 @@ int usb_serial_probe(struct usb_interface *interface,
                port->dev.bus = &usb_serial_bus_type;
 
                snprintf (&port->dev.bus_id[0], sizeof(port->dev.bus_id), "ttyUSB%d", port->number);
-               snprintf (&port->dev.name[0], sizeof(port->dev.name), "usb serial port %d", port->number);
                dbg ("%s - registering %s", __FUNCTION__, port->dev.bus_id);
                device_register (&port->dev);
        }