aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/metro-usb.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 16:39:53 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 16:39:53 -0500
commit1935e357bb2a3031772730293a3725e3cca07778 (patch)
treeea1b1cea354bb6bb149d7a65cf72b95df20f13cf /drivers/usb/serial/metro-usb.c
parentfdac0f647a2cf12e7152dc1d94dd08a1af4a2a82 (diff)
USB: serial: metro-usb: convert to use module_usb_serial_driver
Now that we aren't doing anything special in the init function, move to use the easier module_usb_serial_driver() call instead, saving a lot of lines of unnecessary code. Cc: Aleksey Babahin <tamerlan311@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/metro-usb.c')
-rw-r--r--drivers/usb/serial/metro-usb.c46
1 files changed, 2 insertions, 44 deletions
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index d0c47e1dab1..919dd47ab46 100644
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -153,47 +153,6 @@ static void metrousb_close (struct usb_serial_port *port)
153 153
154/* ---------------------------------------------------------------------------------------------- 154/* ----------------------------------------------------------------------------------------------
155 Description: 155 Description:
156 Driver exit.
157
158 Input:
159 None:
160
161 Output:
162 None:
163*/
164static void __exit metrousb_exit(void)
165{
166 usb_serial_deregister_drivers(&metrousb_driver, serial_drivers);
167}
168
169/* ----------------------------------------------------------------------------------------------
170 Description:
171 Driver initialization.
172
173 Input:
174 None:
175
176 Output:
177 int: Returns true (0) if successful, false otherwise.
178*/
179static int __init metrousb_init(void)
180{
181 int retval = 0;
182
183 dbg("METRO-USB - %s", __FUNCTION__);
184
185 /* Register the devices. */
186 retval = usb_serial_register_drivers(&metrousb_driver, serial_drivers);
187 if (retval)
188 return retval;
189
190 printk(KERN_INFO DRIVER_DESC " : " DRIVER_VERSION);
191
192 return retval;
193}
194
195/* ----------------------------------------------------------------------------------------------
196 Description:
197 Open the drivers serial port. 156 Open the drivers serial port.
198 157
199 Input: 158 Input:
@@ -574,9 +533,8 @@ static void metrousb_unthrottle (struct tty_struct *tty)
574 } 533 }
575} 534}
576 535
577/* Standard module function. */ 536module_usb_serial_driver(metrousb_driver, serial_drivers);
578module_init(metrousb_init); 537
579module_exit(metrousb_exit);
580MODULE_LICENSE("GPL"); 538MODULE_LICENSE("GPL");
581MODULE_AUTHOR( "Philip Nicastro" ); 539MODULE_AUTHOR( "Philip Nicastro" );
582MODULE_AUTHOR( "Aleksey Babahin <tamerlan311@gmail.com>" ); 540MODULE_AUTHOR( "Aleksey Babahin <tamerlan311@gmail.com>" );