From 943d56b0a578cfc10e0340c6f8d6b8795d380e67 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 7 Aug 2008 22:26:55 +0200 Subject: [PATCH] [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 Signed-off-by: Marcel Holtmann --- drivers/bluetooth/bcm203x.c | 9 ++------- drivers/bluetooth/bfusb.c | 10 +--------- drivers/bluetooth/bpa10x.c | 10 +--------- drivers/bluetooth/hci_usb.c | 8 ++------ 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c index 8919ccf827..ee40201c72 100644 --- a/drivers/bluetooth/bcm203x.c +++ b/drivers/bluetooth/bcm203x.c @@ -42,9 +42,7 @@ #define BT_DBG(D...) #endif -#define VERSION "1.1" - -static int ignore = 0; +#define VERSION "1.2" static struct usb_device_id bcm203x_table[] = { /* 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); - if (ignore || (intf->cur_altsetting->desc.bInterfaceNumber != 0)) + if (intf->cur_altsetting->desc.bInterfaceNumber != 0) return -ENODEV; data = kzalloc(sizeof(*data), GFP_KERNEL); @@ -300,9 +298,6 @@ static void __exit bcm203x_exit(void) module_init(bcm203x_init); module_exit(bcm203x_exit); -module_param(ignore, bool, 0644); -MODULE_PARM_DESC(ignore, "Ignore devices from the matching table"); - MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION); MODULE_VERSION(VERSION); diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index 0c211adbc0..90a0946346 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c @@ -43,9 +43,7 @@ #define BT_DBG(D...) #endif -#define VERSION "1.1" - -static int ignore = 0; +#define VERSION "1.2" 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); - if (ignore) - return -ENODEV; - /* Check number of endpoints */ if (intf->cur_altsetting->desc.bNumEndpoints < 2) return -EIO; @@ -795,9 +790,6 @@ static void __exit bfusb_exit(void) module_init(bfusb_init); module_exit(bfusb_exit); -module_param(ignore, bool, 0644); -MODULE_PARM_DESC(ignore, "Ignore devices from the matching table"); - MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION); MODULE_VERSION(VERSION); diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c index 3b28658f5a..1e55a658e6 100644 --- a/drivers/bluetooth/bpa10x.c +++ b/drivers/bluetooth/bpa10x.c @@ -40,9 +40,7 @@ #define BT_DBG(D...) #endif -#define VERSION "0.9" - -static int ignore = 0; +#define VERSION "0.10" static struct usb_device_id bpa10x_table[] = { /* 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); - if (ignore) - return -ENODEV; - if (intf->cur_altsetting->desc.bInterfaceNumber != 0) return -ENODEV; @@ -546,9 +541,6 @@ static void __exit bpa10x_exit(void) module_init(bpa10x_init); module_exit(bpa10x_exit); -module_param(ignore, bool, 0644); -MODULE_PARM_DESC(ignore, "Ignore devices from the matching table"); - MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Digianswer Bluetooth USB driver ver " VERSION); MODULE_VERSION(VERSION); diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index c33bb59ed1..e397572bf5 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c @@ -62,7 +62,6 @@ #define URB_ZERO_PACKET 0 #endif -static int ignore; static int ignore_dga; static int ignore_csr; static int ignore_sniffer; @@ -74,7 +73,7 @@ static int reset; static int isoc = 2; #endif -#define VERSION "2.9" +#define VERSION "2.10" 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; } - if (ignore || id->driver_info & HCI_IGNORE) + if (id->driver_info & HCI_IGNORE) return -ENODEV; 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_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_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001"); -- 2.39.5