summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/bus.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-20 21:15:16 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 16:47:48 -0700
commit269bda1c123c7caf88e1deb2264f9086f0344192 (patch)
treec83d9944e0acdc40c9040cbccfb9ec7d606bdd2c /drivers/usb/serial/bus.c
parent502b95c1cc9e2c855a26f90fc999c5211b8ba957 (diff)
downloadlinux-269bda1c123c7caf88e1deb2264f9086f0344192.tar.gz
linux-269bda1c123c7caf88e1deb2264f9086f0344192.tar.bz2
linux-269bda1c123c7caf88e1deb2264f9086f0344192.zip
[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/bus.c')
-rw-r--r--drivers/usb/serial/bus.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index b8364a8de7df..664139afcfa9 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -72,7 +72,7 @@ static int usb_serial_device_probe (struct device *dev)
tty_register_device (usb_serial_tty_driver, minor, dev);
dev_info(&port->serial->dev->dev,
"%s converter now attached to ttyUSB%d\n",
- driver->name, minor);
+ driver->description, minor);
exit:
return retval;
@@ -104,7 +104,7 @@ exit:
minor = port->number;
tty_unregister_device (usb_serial_tty_driver, minor);
dev_info(dev, "%s converter now disconnected from ttyUSB%d\n",
- driver->name, minor);
+ driver->description, minor);
return retval;
}
@@ -113,10 +113,6 @@ int usb_serial_bus_register(struct usb_serial_driver *driver)
{
int retval;
- if (driver->short_name)
- driver->driver.name = (char *)driver->short_name;
- else
- driver->driver.name = (char *)driver->name;
driver->driver.bus = &usb_serial_bus_type;
driver->driver.probe = usb_serial_device_probe;
driver->driver.remove = usb_serial_device_remove;