diff options
Diffstat (limited to 'drivers/usb/serial/bus.c')
-rw-r--r-- | drivers/usb/serial/bus.c | 8 |
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) | |||
72 | tty_register_device (usb_serial_tty_driver, minor, dev); | 72 | tty_register_device (usb_serial_tty_driver, minor, dev); |
73 | dev_info(&port->serial->dev->dev, | 73 | dev_info(&port->serial->dev->dev, |
74 | "%s converter now attached to ttyUSB%d\n", | 74 | "%s converter now attached to ttyUSB%d\n", |
75 | driver->name, minor); | 75 | driver->description, minor); |
76 | 76 | ||
77 | exit: | 77 | exit: |
78 | return retval; | 78 | return retval; |
@@ -104,7 +104,7 @@ exit: | |||
104 | minor = port->number; | 104 | minor = port->number; |
105 | tty_unregister_device (usb_serial_tty_driver, minor); | 105 | tty_unregister_device (usb_serial_tty_driver, minor); |
106 | dev_info(dev, "%s converter now disconnected from ttyUSB%d\n", | 106 | dev_info(dev, "%s converter now disconnected from ttyUSB%d\n", |
107 | driver->name, minor); | 107 | driver->description, minor); |
108 | 108 | ||
109 | return retval; | 109 | return retval; |
110 | } | 110 | } |
@@ -113,10 +113,6 @@ int usb_serial_bus_register(struct usb_serial_driver *driver) | |||
113 | { | 113 | { |
114 | int retval; | 114 | int retval; |
115 | 115 | ||
116 | if (driver->short_name) | ||
117 | driver->driver.name = (char *)driver->short_name; | ||
118 | else | ||
119 | driver->driver.name = (char *)driver->name; | ||
120 | driver->driver.bus = &usb_serial_bus_type; | 116 | driver->driver.bus = &usb_serial_bus_type; |
121 | driver->driver.probe = usb_serial_device_probe; | 117 | driver->driver.probe = usb_serial_device_probe; |
122 | driver->driver.remove = usb_serial_device_remove; | 118 | driver->driver.remove = usb_serial_device_remove; |