Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 943d56b0a578cfc10e0340c6f8d6b8795d380e67

Authored by Marcel Holtmann
1 parent 28111eb2f5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 4 changed files with 6 additions and 31 deletions Side-by-side Diff

drivers/bluetooth/bcm203x.c
Diff comments   View file @ 943d56b
... ... @@ -42,10 +42,8 @@
42 42 #define BT_DBG(D...)
43 43 #endif
44 44  
45   -#define VERSION "1.1"
  45 +#define VERSION "1.2"
46 46  
47   -static int ignore = 0;
48   -
49 47 static struct usb_device_id bcm203x_table[] = {
50 48 /* Broadcom Blutonium (BCM2033) */
51 49 { USB_DEVICE(0x0a5c, 0x2033) },
... ... @@ -175,7 +173,7 @@
175 173  
176 174 BT_DBG("intf %p id %p", intf, id);
177 175  
178   - if (ignore || (intf->cur_altsetting->desc.bInterfaceNumber != 0))
  176 + if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
179 177 return -ENODEV;
180 178  
181 179 data = kzalloc(sizeof(*data), GFP_KERNEL);
... ... @@ -299,9 +297,6 @@
299 297  
300 298 module_init(bcm203x_init);
301 299 module_exit(bcm203x_exit);
302   -
303   -module_param(ignore, bool, 0644);
304   -MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");
305 300  
306 301 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
307 302 MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);
drivers/bluetooth/bfusb.c
Diff comments   View file @ 943d56b
... ... @@ -43,10 +43,8 @@
43 43 #define BT_DBG(D...)
44 44 #endif
45 45  
46   -#define VERSION "1.1"
  46 +#define VERSION "1.2"
47 47  
48   -static int ignore = 0;
49   -
50 48 static struct usb_driver bfusb_driver;
51 49  
52 50 static struct usb_device_id bfusb_table[] = {
... ... @@ -656,9 +654,6 @@
656 654  
657 655 BT_DBG("intf %p id %p", intf, id);
658 656  
659   - if (ignore)
660   - return -ENODEV;
661   -
662 657 /* Check number of endpoints */
663 658 if (intf->cur_altsetting->desc.bNumEndpoints < 2)
664 659 return -EIO;
... ... @@ -794,9 +789,6 @@
794 789  
795 790 module_init(bfusb_init);
796 791 module_exit(bfusb_exit);
797   -
798   -module_param(ignore, bool, 0644);
799   -MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");
800 792  
801 793 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
802 794 MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION);
drivers/bluetooth/bpa10x.c
Diff comments   View file @ 943d56b
... ... @@ -40,10 +40,8 @@
40 40 #define BT_DBG(D...)
41 41 #endif
42 42  
43   -#define VERSION "0.9"
  43 +#define VERSION "0.10"
44 44  
45   -static int ignore = 0;
46   -
47 45 static struct usb_device_id bpa10x_table[] = {
48 46 /* Tektronix BPA 100/105 (Digianswer) */
49 47 { USB_DEVICE(0x08fd, 0x0002) },
... ... @@ -460,9 +458,6 @@
460 458  
461 459 BT_DBG("intf %p id %p", intf, id);
462 460  
463   - if (ignore)
464   - return -ENODEV;
465   -
466 461 if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
467 462 return -ENODEV;
468 463  
... ... @@ -545,9 +540,6 @@
545 540  
546 541 module_init(bpa10x_init);
547 542 module_exit(bpa10x_exit);
548   -
549   -module_param(ignore, bool, 0644);
550   -MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");
551 543  
552 544 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
553 545 MODULE_DESCRIPTION("Digianswer Bluetooth USB driver ver " VERSION);
drivers/bluetooth/hci_usb.c
Diff comments   View file @ 943d56b
... ... @@ -62,7 +62,6 @@
62 62 #define URB_ZERO_PACKET 0
63 63 #endif
64 64  
65   -static int ignore;
66 65 static int ignore_dga;
67 66 static int ignore_csr;
68 67 static int ignore_sniffer;
... ... @@ -74,7 +73,7 @@
74 73 static int isoc = 2;
75 74 #endif
76 75  
77   -#define VERSION "2.9"
  76 +#define VERSION "2.10"
78 77  
79 78 static struct usb_driver hci_usb_driver;
80 79  
... ... @@ -801,7 +800,7 @@
801 800 id = match;
802 801 }
803 802  
804   - if (ignore || id->driver_info & HCI_IGNORE)
  803 + if (id->driver_info & HCI_IGNORE)
805 804 return -ENODEV;
806 805  
807 806 if (ignore_dga && id->driver_info & HCI_DIGIANSWER)
... ... @@ -1107,9 +1106,6 @@
1107 1106  
1108 1107 module_init(hci_usb_init);
1109 1108 module_exit(hci_usb_exit);
1110   -
1111   -module_param(ignore, bool, 0644);
1112   -MODULE_PARM_DESC(ignore, "Ignore devices from the matching table");
1113 1109  
1114 1110 module_param(ignore_dga, bool, 0644);
1115 1111 MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001");