Skip to content

Commit

Permalink
[Bluetooth] Removal of unnecessary ignore module parameter
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marcel Holtmann committed Aug 7, 2008
1 parent 28111eb commit 943d56b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 31 deletions.
9 changes: 2 additions & 7 deletions drivers/bluetooth/bcm203x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 <marcel@holtmann.org>");
MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);
MODULE_VERSION(VERSION);
Expand Down
10 changes: 1 addition & 9 deletions drivers/bluetooth/bfusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 <marcel@holtmann.org>");
MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION);
MODULE_VERSION(VERSION);
Expand Down
10 changes: 1 addition & 9 deletions drivers/bluetooth/bpa10x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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 <marcel@holtmann.org>");
MODULE_DESCRIPTION("Digianswer Bluetooth USB driver ver " VERSION);
MODULE_VERSION(VERSION);
Expand Down
8 changes: 2 additions & 6 deletions drivers/bluetooth/hci_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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");

Expand Down

0 comments on commit 943d56b

Please sign in to comment.