diff options
Diffstat (limited to 'drivers/usb/serial/empeg.c')
-rw-r--r-- | drivers/usb/serial/empeg.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c index 5b99fc09e327..cdf61dd07318 100644 --- a/drivers/usb/serial/empeg.c +++ b/drivers/usb/serial/empeg.c | |||
@@ -51,13 +51,6 @@ static const struct usb_device_id id_table[] = { | |||
51 | 51 | ||
52 | MODULE_DEVICE_TABLE(usb, id_table); | 52 | MODULE_DEVICE_TABLE(usb, id_table); |
53 | 53 | ||
54 | static struct usb_driver empeg_driver = { | ||
55 | .name = "empeg", | ||
56 | .probe = usb_serial_probe, | ||
57 | .disconnect = usb_serial_disconnect, | ||
58 | .id_table = id_table, | ||
59 | }; | ||
60 | |||
61 | static struct usb_serial_driver empeg_device = { | 54 | static struct usb_serial_driver empeg_device = { |
62 | .driver = { | 55 | .driver = { |
63 | .owner = THIS_MODULE, | 56 | .owner = THIS_MODULE, |
@@ -80,14 +73,12 @@ static int empeg_startup(struct usb_serial *serial) | |||
80 | { | 73 | { |
81 | int r; | 74 | int r; |
82 | 75 | ||
83 | dbg("%s", __func__); | ||
84 | |||
85 | if (serial->dev->actconfig->desc.bConfigurationValue != 1) { | 76 | if (serial->dev->actconfig->desc.bConfigurationValue != 1) { |
86 | dev_err(&serial->dev->dev, "active config #%d != 1 ??\n", | 77 | dev_err(&serial->dev->dev, "active config #%d != 1 ??\n", |
87 | serial->dev->actconfig->desc.bConfigurationValue); | 78 | serial->dev->actconfig->desc.bConfigurationValue); |
88 | return -ENODEV; | 79 | return -ENODEV; |
89 | } | 80 | } |
90 | dbg("%s - reset config", __func__); | 81 | |
91 | r = usb_reset_configuration(serial->dev); | 82 | r = usb_reset_configuration(serial->dev); |
92 | 83 | ||
93 | /* continue on with initialization */ | 84 | /* continue on with initialization */ |
@@ -138,7 +129,7 @@ static void empeg_init_termios(struct tty_struct *tty) | |||
138 | tty_encode_baud_rate(tty, 115200, 115200); | 129 | tty_encode_baud_rate(tty, 115200, 115200); |
139 | } | 130 | } |
140 | 131 | ||
141 | module_usb_serial_driver(empeg_driver, serial_drivers); | 132 | module_usb_serial_driver(serial_drivers, id_table); |
142 | 133 | ||
143 | MODULE_AUTHOR(DRIVER_AUTHOR); | 134 | MODULE_AUTHOR(DRIVER_AUTHOR); |
144 | MODULE_DESCRIPTION(DRIVER_DESC); | 135 | MODULE_DESCRIPTION(DRIVER_DESC); |