aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/usb-serial.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 19:47:48 -0400
commit269bda1c123c7caf88e1deb2264f9086f0344192 (patch)
treec83d9944e0acdc40c9040cbccfb9ec7d606bdd2c /drivers/usb/serial/usb-serial.c
parent502b95c1cc9e2c855a26f90fc999c5211b8ba957 (diff)
[PATCH] USB Serial: move name to driver structure
This fixes up a lot of problems in sysfs with some of the usb serial drivers, they had incorrect driver names. Also saves a tiny ammount of memory. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
-rw-r--r--drivers/usb/serial/usb-serial.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index fde09fba8790..13f6592be685 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -122,7 +122,7 @@ static void destroy_serial(struct kref *kref)
122 122
123 serial = to_usb_serial(kref); 123 serial = to_usb_serial(kref);
124 124
125 dbg ("%s - %s", __FUNCTION__, serial->type->name); 125 dbg("%s - %s", __FUNCTION__, serial->type->description);
126 126
127 serial->type->shutdown(serial); 127 serial->type->shutdown(serial);
128 128
@@ -415,7 +415,7 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int
415 length += sprintf (page+length, "%d:", i); 415 length += sprintf (page+length, "%d:", i);
416 if (serial->type->driver.owner) 416 if (serial->type->driver.owner)
417 length += sprintf (page+length, " module:%s", module_name(serial->type->driver.owner)); 417 length += sprintf (page+length, " module:%s", module_name(serial->type->driver.owner));
418 length += sprintf (page+length, " name:\"%s\"", serial->type->name); 418 length += sprintf (page+length, " name:\"%s\"", serial->type->description);
419 length += sprintf (page+length, " vendor:%04x product:%04x", 419 length += sprintf (page+length, " vendor:%04x product:%04x",
420 le16_to_cpu(serial->dev->descriptor.idVendor), 420 le16_to_cpu(serial->dev->descriptor.idVendor),
421 le16_to_cpu(serial->dev->descriptor.idProduct)); 421 le16_to_cpu(serial->dev->descriptor.idProduct));
@@ -687,7 +687,7 @@ int usb_serial_probe(struct usb_interface *interface,
687#endif 687#endif
688 688
689 /* found all that we need */ 689 /* found all that we need */
690 dev_info(&interface->dev, "%s converter detected\n", type->name); 690 dev_info(&interface->dev, "%s converter detected\n", type->description);
691 691
692#ifdef CONFIG_USB_SERIAL_GENERIC 692#ifdef CONFIG_USB_SERIAL_GENERIC
693 if (type == &usb_serial_generic_device) { 693 if (type == &usb_serial_generic_device) {
@@ -1088,16 +1088,19 @@ int usb_serial_register(struct usb_serial_driver *driver)
1088 1088
1089 fixup_generic(driver); 1089 fixup_generic(driver);
1090 1090
1091 if (!driver->description)
1092 driver->description = driver->driver.name;
1093
1091 /* Add this device to our list of devices */ 1094 /* Add this device to our list of devices */
1092 list_add(&driver->driver_list, &usb_serial_driver_list); 1095 list_add(&driver->driver_list, &usb_serial_driver_list);
1093 1096
1094 retval = usb_serial_bus_register(driver); 1097 retval = usb_serial_bus_register(driver);
1095 if (retval) { 1098 if (retval) {
1096 err("problem %d when registering driver %s", retval, driver->name); 1099 err("problem %d when registering driver %s", retval, driver->description);
1097 list_del(&driver->driver_list); 1100 list_del(&driver->driver_list);
1098 } 1101 }
1099 else 1102 else
1100 info("USB Serial support registered for %s", driver->name); 1103 info("USB Serial support registered for %s", driver->description);
1101 1104
1102 return retval; 1105 return retval;
1103} 1106}
@@ -1105,7 +1108,7 @@ int usb_serial_register(struct usb_serial_driver *driver)
1105 1108
1106void usb_serial_deregister(struct usb_serial_driver *device) 1109void usb_serial_deregister(struct usb_serial_driver *device)
1107{ 1110{
1108 info("USB Serial deregistering driver %s", device->name); 1111 info("USB Serial deregistering driver %s", device->description);
1109 list_del(&device->driver_list); 1112 list_del(&device->driver_list);
1110 usb_serial_bus_deregister(device); 1113 usb_serial_bus_deregister(device);
1111} 1114}