Commit fdac0f64 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: serial: metro-usb: remove vendor and product module parameters

All new usb serial drivers should be using the dynamic id function, not
having module parameters for this type of thing.  So remove them before
anyone gets used to them being there.

Cc: Aleksey Babahin <tamerlan311@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 62f2a83d
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
NOTES: NOTES:
To install the driver: To install the driver:
1. Install the usbserial.ko module supplied by Linux with: # insmod usbserial.ko 1. Install the usbserial.ko module supplied by Linux with: # insmod usbserial.ko
2. Install the metro-usb.ko module with: # insmod metro-usb.ko vender=0x#### product=0x#### debug=1 2. Install the metro-usb.ko module with: # insmod metro-usb.ko
The vendor, product and debug parameters are optional.
Some of this code is credited to Linux USB open source files that are distributed with Linux. Some of this code is credited to Linux USB open source files that are distributed with Linux.
...@@ -54,15 +53,12 @@ ...@@ -54,15 +53,12 @@
static struct usb_device_id id_table [] = { static struct usb_device_id id_table [] = {
{ USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID) }, { USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID) },
{ USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_UNI) }, { USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_UNI) },
{ }, /* Optional paramenter entry. */
{ }, /* Terminating entry. */ { }, /* Terminating entry. */
}; };
MODULE_DEVICE_TABLE(usb, id_table); MODULE_DEVICE_TABLE(usb, id_table);
/* Input parameter constants. */ /* Input parameter constants. */
static int debug; static bool debug;
static __u16 vendor;
static __u16 product;
/* Function prototypes. */ /* Function prototypes. */
static void metrousb_cleanup (struct usb_serial_port *port); static void metrousb_cleanup (struct usb_serial_port *port);
...@@ -183,26 +179,9 @@ static void __exit metrousb_exit(void) ...@@ -183,26 +179,9 @@ static void __exit metrousb_exit(void)
static int __init metrousb_init(void) static int __init metrousb_init(void)
{ {
int retval = 0; int retval = 0;
int i = 0;
dbg("METRO-USB - %s", __FUNCTION__); dbg("METRO-USB - %s", __FUNCTION__);
/* Add the device parameters if entered. */
if ((vendor > 0) && (product > 0)) {
struct usb_device_id usb_dev_temp[] = { {USB_DEVICE(vendor, product) } };
/* Find the last entry in id_table */
for (i=0; i < ARRAY_SIZE(id_table); i++) {
if (id_table[i].idVendor == 0) {
id_table[i] = usb_dev_temp[0];
break;
}
}
dbg("METRO-USB - %s - support added for unknown device: vendor=0x%x - product=0x%x", __FUNCTION__, vendor, product);
printk(KERN_INFO "Metro USB-POS support added for unknown device: vendor=0x%x - product=0x%x", vendor, product);
}
/* Register the devices. */ /* Register the devices. */
retval = usb_serial_register_drivers(&metrousb_driver, serial_drivers); retval = usb_serial_register_drivers(&metrousb_driver, serial_drivers);
if (retval) if (retval)
...@@ -606,13 +585,3 @@ MODULE_DESCRIPTION( DRIVER_DESC ); ...@@ -606,13 +585,3 @@ MODULE_DESCRIPTION( DRIVER_DESC );
/* Module input parameters */ /* Module input parameters */
module_param(debug, bool, S_IRUGO | S_IWUSR); module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Print debug info (bool 1=on, 0=off)"); MODULE_PARM_DESC(debug, "Print debug info (bool 1=on, 0=off)");
module_param(vendor, ushort, 0);
MODULE_PARM_DESC(vendor, "User specified vendor ID (ushort)");
module_param(product, ushort, 0);
MODULE_PARM_DESC(product, "User specified product ID (ushort)");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment