From 7dc4125db28f6ec7741cc8939ddf4dcc5763c1b3 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 9 Mar 2012 16:38:14 -0800
Subject: [PATCH] --- yaml --- r: 289674 b: refs/heads/master c:
 b790f5d1260b4c962bd066cd34ae982943c27fe1 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/include/linux/usb/serial.h | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index fb48dbacc171..07a7ead06e47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd4946188aac597d187a765127fd26fa3644c29f
+refs/heads/master: b790f5d1260b4c962bd066cd34ae982943c27fe1
diff --git a/trunk/include/linux/usb/serial.h b/trunk/include/linux/usb/serial.h
index 7b1db841e2a8..fbb666b1b670 100644
--- a/trunk/include/linux/usb/serial.h
+++ b/trunk/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 */