ChangeSet 1.1757.66.27, 2004/07/14 15:01:31-07:00, greg@kroah.com [PATCH] USB: change all usbserial drivers to use module_param() Signed-off-by: Greg Kroah-Hartman drivers/usb/serial/belkin_sa.c | 3 +-- drivers/usb/serial/cyberjack.c | 3 +-- drivers/usb/serial/digi_acceleport.c | 3 +-- drivers/usb/serial/empeg.c | 3 +-- drivers/usb/serial/ftdi_sio.c | 2 +- drivers/usb/serial/io_edgeport.c | 3 +-- drivers/usb/serial/io_ti.c | 4 ++-- drivers/usb/serial/ipaq.c | 8 ++++---- drivers/usb/serial/ir-usb.c | 6 +++--- drivers/usb/serial/keyspan.c | 2 +- drivers/usb/serial/keyspan_pda.c | 2 +- drivers/usb/serial/kl5kusb105.c | 6 +----- drivers/usb/serial/kobil_sct.c | 2 +- drivers/usb/serial/mct_u232.c | 4 ++-- drivers/usb/serial/omninet.c | 3 +-- drivers/usb/serial/safe_serial.c | 21 +++++++++++---------- drivers/usb/serial/whiteheat.c | 4 ++-- 17 files changed, 35 insertions(+), 44 deletions(-) diff -Nru a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c --- a/drivers/usb/serial/belkin_sa.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/belkin_sa.c 2004-07-14 16:43:59 -07:00 @@ -614,6 +614,5 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); - diff -Nru a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c --- a/drivers/usb/serial/cyberjack.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/cyberjack.c 2004-07-14 16:43:59 -07:00 @@ -520,6 +520,5 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); - diff -Nru a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c --- a/drivers/usb/serial/digi_acceleport.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/digi_acceleport.c 2004-07-14 16:43:59 -07:00 @@ -2068,6 +2068,5 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); - diff -Nru a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c --- a/drivers/usb/serial/empeg.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/empeg.c 2004-07-14 16:43:59 -07:00 @@ -609,6 +609,5 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); - diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c --- a/drivers/usb/serial/ftdi_sio.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/ftdi_sio.c 2004-07-14 16:43:59 -07:00 @@ -2241,6 +2241,6 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c --- a/drivers/usb/serial/io_edgeport.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/io_edgeport.c 2004-07-14 16:43:59 -07:00 @@ -3074,6 +3074,5 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); - diff -Nru a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c --- a/drivers/usb/serial/io_ti.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/io_ti.c 2004-07-14 16:43:59 -07:00 @@ -2684,9 +2684,9 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); -MODULE_PARM(ignore_cpu_rev, "i"); +module_param(ignore_cpu_rev, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(ignore_cpu_rev, "Ignore the cpu revision when connecting to a device"); diff -Nru a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c --- a/drivers/usb/serial/ipaq.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/ipaq.c 2004-07-14 16:43:59 -07:00 @@ -76,7 +76,7 @@ #define DRIVER_AUTHOR "Ganesh Varadarajan " #define DRIVER_DESC "USB PocketPC PDA driver" -static int product, vendor; +static __u16 product, vendor; /* Function prototypes for an ipaq */ static int ipaq_open (struct usb_serial_port *port, struct file *filp); @@ -579,11 +579,11 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); -MODULE_PARM(vendor, "h"); +module_param(vendor, ushort, 0); MODULE_PARM_DESC(vendor, "User specified USB idVendor"); -MODULE_PARM(product, "h"); +module_param(product, ushort, 0); MODULE_PARM_DESC(product, "User specified USB idProduct"); diff -Nru a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c --- a/drivers/usb/serial/ir-usb.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/ir-usb.c 2004-07-14 16:43:59 -07:00 @@ -614,10 +614,10 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); -MODULE_PARM(xbof, "i"); +module_param(xbof, int, 0); MODULE_PARM_DESC(xbof, "Force specific number of XBOFs"); -MODULE_PARM(buffer_size, "i"); +module_param(buffer_size, int, 0); MODULE_PARM_DESC(buffer_size, "Size of the transfer buffers"); diff -Nru a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c --- a/drivers/usb/serial/keyspan.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/keyspan.c 2004-07-14 16:43:59 -07:00 @@ -2362,6 +2362,6 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff -Nru a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c --- a/drivers/usb/serial/keyspan_pda.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/keyspan_pda.c 2004-07-14 16:43:59 -07:00 @@ -909,6 +909,6 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff -Nru a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c --- a/drivers/usb/serial/kl5kusb105.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/kl5kusb105.c 2004-07-14 16:43:59 -07:00 @@ -1051,11 +1051,7 @@ MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "enable extensive debugging messages"); -/* FIXME: implement -MODULE_PARM(num_urbs, "i"); -MODULE_PARM_DESC(num_urbs, "number of URBs to use in write pool"); -*/ /* vim: set sts=8 ts=8 sw=8: */ diff -Nru a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c --- a/drivers/usb/serial/kobil_sct.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/kobil_sct.c 2004-07-14 16:43:59 -07:00 @@ -788,5 +788,5 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE( "GPL" ); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff -Nru a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c --- a/drivers/usb/serial/mct_u232.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/mct_u232.c 2004-07-14 16:43:59 -07:00 @@ -912,11 +912,11 @@ MODULE_LICENSE("GPL"); #ifdef FIX_WRITE_RETURN_CODE_PROBLEM -MODULE_PARM(write_blocking, "i"); +module_param(write_blocking, int, 0); MODULE_PARM_DESC(write_blocking, "The write function will block to write out all data"); #endif -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff -Nru a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c --- a/drivers/usb/serial/omninet.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/omninet.c 2004-07-14 16:43:59 -07:00 @@ -373,6 +373,5 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); - diff -Nru a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c --- a/drivers/usb/serial/safe_serial.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/safe_serial.c 2004-07-14 16:43:59 -07:00 @@ -102,19 +102,20 @@ #if ! defined(CONFIG_USBD_SAFE_SERIAL_VENDOR) static __u16 vendor; // no default static __u16 product; // no default -MODULE_PARM (vendor, "i"); -MODULE_PARM (product, "i"); -MODULE_PARM_DESC (vendor, "User specified USB idVendor (required)"); -MODULE_PARM_DESC (product, "User specified USB idProduct (required)"); +module_param(vendor, ushort, 0); +MODULE_PARM_DESC(vendor, "User specified USB idVendor (required)"); +module_param(product, ushort, 0); +MODULE_PARM_DESC(product, "User specified USB idProduct (required)"); #endif -MODULE_PARM (debug, "i"); -MODULE_PARM (safe, "i"); -MODULE_PARM (padded, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Debug enabled or not"); -MODULE_PARM_DESC (debug, "Debug enabled or not"); -MODULE_PARM_DESC (safe, "Turn Safe Encapsulation On/Off"); -MODULE_PARM_DESC (padded, "Pad to full wMaxPacketSize On/Off"); +module_param(safe, bool, 0); +MODULE_PARM_DESC(safe, "Turn Safe Encapsulation On/Off"); + +module_param(padded, bool, 0); +MODULE_PARM_DESC(padded, "Pad to full wMaxPacketSize On/Off"); #define CDC_DEVICE_CLASS 0x02 diff -Nru a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c --- a/drivers/usb/serial/whiteheat.c 2004-07-14 16:43:59 -07:00 +++ b/drivers/usb/serial/whiteheat.c 2004-07-14 16:43:59 -07:00 @@ -1519,8 +1519,8 @@ MODULE_DESCRIPTION( DRIVER_DESC ); MODULE_LICENSE("GPL"); -MODULE_PARM(urb_pool_size, "i"); +module_param(urb_pool_size, int, 0); MODULE_PARM_DESC(urb_pool_size, "Number of urbs to use for buffering"); -MODULE_PARM(debug, "i"); +module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not");