kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: create module_usb_serial_driver macro

Browse source 
Now that Alan Stern has cleaned up the usb serial driver registration,
we have the ability to create a module_usb_serial_driver macro to make
things a bit simpler, like the other *_driver macros created.

But, as we need two functions here, we can't reuse the existing
module_driver() macro, so we need to roll our own.

Here's a patch implementing module_usb_serial_driver() and it converts
the pl2303 driver to use it, showing a nice cleanup.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg KH 2012-02-24 15:38:14 -08:00 committed by Greg Kroah-Hartman
parent 03892d5fef
commit d1cddb4a8e
2 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/usb/serial/pl2303.c
View file

@ -855,23 +855,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
&pl2303_device, NULL
};
static int __init pl2303_init(void)
{
int retval;
retval = usb_serial_register_drivers(&pl2303_driver, serial_drivers);
if (retval == 0)
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
return retval;
}
static void __exit pl2303_exit(void)
{
usb_serial_deregister_drivers(&pl2303_driver, serial_drivers);
}
module_init(pl2303_init);
module_exit(pl2303_exit);
module_usb_serial_driver(pl2303_driver, serial_drivers);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");

28
include/linux/usb/serial.h
View file

@ -406,5 +406,33 @@ do { \
} \
} while (0)
/*
* 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
*
* Helper macro for USB serial drivers which do not do anything special
* in module init/exit. This eliminates a lot of boilerplate. Each
* 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);
#endif /* __LINUX_USB_SERIAL_H */