USB: Remove dead references to "SAFE_SERIAL" CONFIG variables.
Remove the references to CONFIG_USBD_SAFE_SERIAL_{VENDOR,PRODUCT}, which aren't defined in any Kconfig file. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
89a0fd18a9
commit
9f705bde6e
|
@ -90,18 +90,12 @@ MODULE_AUTHOR (DRIVER_AUTHOR);
|
||||||
MODULE_DESCRIPTION (DRIVER_DESC);
|
MODULE_DESCRIPTION (DRIVER_DESC);
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
#if defined(CONFIG_USBD_SAFE_SERIAL_VENDOR) && !defined(CONFIG_USBD_SAFE_SERIAL_PRODUCT)
|
|
||||||
#error "SAFE_SERIAL_VENDOR defined without SAFE_SERIAL_PRODUCT"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if ! defined(CONFIG_USBD_SAFE_SERIAL_VENDOR)
|
|
||||||
static __u16 vendor; // no default
|
static __u16 vendor; // no default
|
||||||
static __u16 product; // no default
|
static __u16 product; // no default
|
||||||
module_param(vendor, ushort, 0);
|
module_param(vendor, ushort, 0);
|
||||||
MODULE_PARM_DESC(vendor, "User specified USB idVendor (required)");
|
MODULE_PARM_DESC(vendor, "User specified USB idVendor (required)");
|
||||||
module_param(product, ushort, 0);
|
module_param(product, ushort, 0);
|
||||||
MODULE_PARM_DESC(product, "User specified USB idProduct (required)");
|
MODULE_PARM_DESC(product, "User specified USB idProduct (required)");
|
||||||
#endif
|
|
||||||
|
|
||||||
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
||||||
MODULE_PARM_DESC(debug, "Debug enabled or not");
|
MODULE_PARM_DESC(debug, "Debug enabled or not");
|
||||||
|
@ -145,11 +139,6 @@ static struct usb_device_id id_table[] = {
|
||||||
{MY_USB_DEVICE (0x4dd, 0x8003, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)}, // Collie
|
{MY_USB_DEVICE (0x4dd, 0x8003, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)}, // Collie
|
||||||
{MY_USB_DEVICE (0x4dd, 0x8004, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)}, // Collie
|
{MY_USB_DEVICE (0x4dd, 0x8004, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)}, // Collie
|
||||||
{MY_USB_DEVICE (0x5f9, 0xffff, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)}, // Sharp tmp
|
{MY_USB_DEVICE (0x5f9, 0xffff, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)}, // Sharp tmp
|
||||||
#if defined(CONFIG_USB_SAFE_SERIAL_VENDOR)
|
|
||||||
{MY_USB_DEVICE
|
|
||||||
(CONFIG_USB_SAFE_SERIAL_VENDOR, CONFIG_USB_SAFE_SERIAL_PRODUCT, CDC_DEVICE_CLASS,
|
|
||||||
LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)},
|
|
||||||
#endif
|
|
||||||
// extra null entry for module
|
// extra null entry for module
|
||||||
// vendor/produc parameters
|
// vendor/produc parameters
|
||||||
{MY_USB_DEVICE (0, 0, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)},
|
{MY_USB_DEVICE (0, 0, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)},
|
||||||
|
|
Loading…
Reference in a new issue