summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-09 16:38:14 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-09 16:38:14 -0800
commitb790f5d1260b4c962bd066cd34ae982943c27fe1 (patch)
tree26170acf36f899b32c6bbf999b9933f275519bce /include
parentcd4946188aac597d187a765127fd26fa3644c29f (diff)
USB: serial: use module_driver() macro
Now that module_driver() can handle varargs, use it instead of rolling our own version. Cc: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/usb/serial.h17
1 files changed, 2 insertions, 15 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 7b1db841e2a8..fbb666b1b670 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -416,23 +416,10 @@ do { \
* module may only use this macro once, and calling it replaces
* module_init() and module_exit()
*
- * Note, we can't use the generic module_driver() call here, due to the
- * two parameters in the usb_serial_* functions, so we roll our own here
- * :(
*/
#define module_usb_serial_driver(__usb_driver, __serial_drivers) \
-static int __init usb_serial_driver_init(void) \
-{ \
- return usb_serial_register_drivers(&(__usb_driver), \
- (__serial_drivers)); \
-} \
-module_init(usb_serial_driver_init); \
-static void __exit usb_serial_driver_exit(void) \
-{ \
- return usb_serial_deregister_drivers(&(__usb_driver), \
- (__serial_drivers)); \
-} \
-module_exit(usb_serial_driver_exit);
+ module_driver(__usb_driver, usb_serial_register_drivers, \
+ usb_serial_deregister_drivers, __serial_drivers)
#endif /* __LINUX_USB_SERIAL_H */