From 68e24113457e437b1576670f2419b77ed0531e9e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 8 May 2012 15:46:14 -0700 Subject: USB: serial: rework usb_serial_register/deregister_drivers() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reworks the usb_serial_register_drivers() and usb_serial_deregister_drivers() to not need a pointer to a struct usb_driver anymore. The usb_driver structure is now created dynamically and registered and unregistered as needed. This saves lines of code in each usb-serial driver. All in-kernel users of these functions were also fixed up at this time. The pl2303 driver was tested that everything worked properly. Thanks for the idea to do this from Alan Stern. Cc: Adhir Ramjiawan Cc: Alan Stern Cc: Al Borchers Cc: Aleksey Babahin Cc: Andrew Morton Cc: Andrew Worsley Cc: Bart Hartgers Cc: Bill Pemberton Cc: Dan Carpenter Cc: Dan Williams Cc: Donald Lee Cc: Eric Dumazet Cc: "Eric W. Biederman" Cc: Felipe Balbi Cc: Gary Brubaker Cc: Jesper Juhl Cc: Jiri Kosina Cc: Johan Hovold Cc: Julia Lawall Cc: Kautuk Consul Cc: Kuninori Morimoto Cc: Lonnie Mendez Cc: Matthias Bruestle and Harald Welte Cc: Matthias Urlichs Cc: Mauro Carvalho Chehab Cc: Michal Sroczynski Cc: "Michał Wróbel" Cc: Oliver Neukum Cc: Paul Gortmaker Cc: Peter Berger Cc: Preston Fick Cc: "Rafael J. Wysocki" Cc: Rigbert Hamisch Cc: Rusty Russell Cc: Simon Arlott Cc: Support Department Cc: Thomas Tuttle Cc: Uwe Bonnes Cc: Wang YanQing Cc: William Greathouse Signed-off-by: Greg Kroah-Hartman --- include/linux/usb/serial.h | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'include/linux/usb') diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 749836f2890c..c9f65146a039 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -292,10 +292,9 @@ struct usb_serial_driver { #define to_usb_serial_driver(d) \ container_of(d, struct usb_serial_driver, driver) -extern int usb_serial_register_drivers(struct usb_driver *udriver, - struct usb_serial_driver * const serial_drivers[]); -extern void usb_serial_deregister_drivers(struct usb_driver *udriver, - struct usb_serial_driver * const serial_drivers[]); +extern int usb_serial_register_drivers(struct usb_serial_driver *const serial_drivers[], + const char *name, const struct usb_device_id *id_table); +extern void usb_serial_deregister_drivers(struct usb_serial_driver *const serial_drivers[]); extern void usb_serial_port_softint(struct usb_serial_port *port); extern int usb_serial_suspend(struct usb_interface *intf, pm_message_t message); @@ -396,8 +395,8 @@ do { \ /* * module_usb_serial_driver() - Helper macro for registering a USB Serial driver - * @__usb_driver: usb_driver struct to register * @__serial_drivers: list of usb_serial drivers to register + * @__ids: all device ids that @__serial_drivers bind to * * Helper macro for USB serial drivers which do not do anything special * in module init/exit. This eliminates a lot of boilerplate. Each @@ -405,9 +404,21 @@ do { \ * module_init() and module_exit() * */ -#define module_usb_serial_driver(__usb_driver, __serial_drivers) \ - module_driver(__usb_driver, usb_serial_register_drivers, \ - usb_serial_deregister_drivers, __serial_drivers) +#define usb_serial_module_driver(__name, __serial_drivers, __ids) \ +static int __init usb_serial_module_init(void) \ +{ \ + return usb_serial_register_drivers(__serial_drivers, \ + __name, __ids); \ +} \ +module_init(usb_serial_module_init); \ +static void __exit usb_serial_module_exit(void) \ +{ \ + usb_serial_deregister_drivers(__serial_drivers); \ +} \ +module_exit(usb_serial_module_exit); + +#define module_usb_serial_driver(__serial_drivers, __ids) \ + usb_serial_module_driver(KBUILD_MODNAME, __serial_drivers, __ids) #endif /* __LINUX_USB_SERIAL_H */ -- cgit v1.3-18-gd494