UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Bluetooth] Removal of unnecessary ignore module parameter 

This removes the unnecessary ignore parameter, which is useless. There
are alternate methods of kicking a driver off an USB device.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Marcel Holtmann 2008-08-07 22:26:55 +02:00
parent 28111eb2f5
commit 943d56b0a5
4 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/bluetooth/bcm203x.c
View File

@ -42,9 +42,7 @@
#define BT_DBG(D...) #define BT_DBG(D...)
#endif #endif
#define VERSION "1.1" #define VERSION "1.2"
static int ignore = 0;
static struct usb_device_id bcm203x_table[] = { static struct usb_device_id bcm203x_table[] = {
/* Broadcom Blutonium (BCM2033) */ /* Broadcom Blutonium (BCM2033) */
@ -175,7 +173,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
BT_DBG("intf %p id %p", intf, id); BT_DBG("intf %p id %p", intf, id);
if (ignore || (intf->cur_altsetting->desc.bInterfaceNumber != 0)) if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
return -ENODEV; return -ENODEV;
data = kzalloc(sizeof(*data), GFP_KERNEL); data = kzalloc(sizeof(*data), GFP_KERNEL);
@ -300,9 +298,6 @@ static void __exit bcm203x_exit(void)
module_init(bcm203x_init); module_init(bcm203x_init);
module_exit(bcm203x_exit); module_exit(bcm203x_exit);
module_param(ignore, bool, 0644);
MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION); MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);
MODULE_VERSION(VERSION); MODULE_VERSION(VERSION);

10
drivers/bluetooth/bfusb.c
View File

@ -43,9 +43,7 @@
#define BT_DBG(D...) #define BT_DBG(D...)
#endif #endif
#define VERSION "1.1" #define VERSION "1.2"
static int ignore = 0;
static struct usb_driver bfusb_driver; static struct usb_driver bfusb_driver;
@ -656,9 +654,6 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
BT_DBG("intf %p id %p", intf, id); BT_DBG("intf %p id %p", intf, id);
if (ignore)
return -ENODEV;
/* Check number of endpoints */ /* Check number of endpoints */
if (intf->cur_altsetting->desc.bNumEndpoints < 2) if (intf->cur_altsetting->desc.bNumEndpoints < 2)
return -EIO; return -EIO;
@ -795,9 +790,6 @@ static void __exit bfusb_exit(void)
module_init(bfusb_init); module_init(bfusb_init);
module_exit(bfusb_exit); module_exit(bfusb_exit);
module_param(ignore, bool, 0644);
MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION); MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION);
MODULE_VERSION(VERSION); MODULE_VERSION(VERSION);

10
drivers/bluetooth/bpa10x.c
View File

@ -40,9 +40,7 @@
#define BT_DBG(D...) #define BT_DBG(D...)
#endif #endif
#define VERSION "0.9" #define VERSION "0.10"
static int ignore = 0;
static struct usb_device_id bpa10x_table[] = { static struct usb_device_id bpa10x_table[] = {
/* Tektronix BPA 100/105 (Digianswer) */ /* Tektronix BPA 100/105 (Digianswer) */
@ -460,9 +458,6 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
BT_DBG("intf %p id %p", intf, id); BT_DBG("intf %p id %p", intf, id);
if (ignore)
return -ENODEV;
if (intf->cur_altsetting->desc.bInterfaceNumber != 0) if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
return -ENODEV; return -ENODEV;
@ -546,9 +541,6 @@ static void __exit bpa10x_exit(void)
module_init(bpa10x_init); module_init(bpa10x_init);
module_exit(bpa10x_exit); module_exit(bpa10x_exit);
module_param(ignore, bool, 0644);
MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("Digianswer Bluetooth USB driver ver " VERSION); MODULE_DESCRIPTION("Digianswer Bluetooth USB driver ver " VERSION);
MODULE_VERSION(VERSION); MODULE_VERSION(VERSION);

8
drivers/bluetooth/hci_usb.c
View File

@ -62,7 +62,6 @@
#define URB_ZERO_PACKET 0 #define URB_ZERO_PACKET 0
#endif #endif
static int ignore;
static int ignore_dga; static int ignore_dga;
static int ignore_csr; static int ignore_csr;
static int ignore_sniffer; static int ignore_sniffer;
@ -74,7 +73,7 @@ static int reset;
static int isoc = 2; static int isoc = 2;
#endif #endif
#define VERSION "2.9" #define VERSION "2.10"
static struct usb_driver hci_usb_driver; static struct usb_driver hci_usb_driver;
@ -801,7 +800,7 @@ static int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id
id = match; id = match;
} }
if (ignore || id->driver_info & HCI_IGNORE) if (id->driver_info & HCI_IGNORE)
return -ENODEV; return -ENODEV;
if (ignore_dga && id->driver_info & HCI_DIGIANSWER) if (ignore_dga && id->driver_info & HCI_DIGIANSWER)
@ -1108,9 +1107,6 @@ static void __exit hci_usb_exit(void)
module_init(hci_usb_init); module_init(hci_usb_init);
module_exit(hci_usb_exit); module_exit(hci_usb_exit);
module_param(ignore, bool, 0644);
MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");
module_param(ignore_dga, bool, 0644); module_param(ignore_dga, bool, 0644);
MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001"); MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001");