diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-06-07 12:09:57 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-06-08 08:50:01 -0400 |
commit | ac28494c51ad20c7ff9cb991eaeee359a500d88e (patch) | |
tree | 44a637f288705423c9ff74a103eea98a31b393ff /drivers/bluetooth | |
parent | b4324b5dc5b62ba76372e1bf8927230cf744df66 (diff) |
Bluetooth: Use only MISC_DYNAMIC_MINOR for virtual driver
Allowing to specify a specific misc minor number for the virtual driver
is pretty much useless and nobody is using this feature. So just remove
it and use MISC_DYNAMIC_MINOR all the time.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/hci_vhci.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index 0bbefba6469c..379d3025cf33 100644 --- a/drivers/bluetooth/hci_vhci.c +++ b/drivers/bluetooth/hci_vhci.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <net/bluetooth/bluetooth.h> | 40 | #include <net/bluetooth/bluetooth.h> |
41 | #include <net/bluetooth/hci_core.h> | 41 | #include <net/bluetooth/hci_core.h> |
42 | 42 | ||
43 | #define VERSION "1.2" | 43 | #define VERSION "1.3" |
44 | 44 | ||
45 | static int minor = MISC_DYNAMIC_MINOR; | 45 | static int minor = MISC_DYNAMIC_MINOR; |
46 | 46 | ||
@@ -342,16 +342,15 @@ static const struct file_operations vhci_fops = { | |||
342 | }; | 342 | }; |
343 | 343 | ||
344 | static struct miscdevice vhci_miscdev= { | 344 | static struct miscdevice vhci_miscdev= { |
345 | .name = "vhci", | 345 | .name = "vhci", |
346 | .fops = &vhci_fops, | 346 | .fops = &vhci_fops, |
347 | .minor = MISC_DYNAMIC_MINOR, | ||
347 | }; | 348 | }; |
348 | 349 | ||
349 | static int __init vhci_init(void) | 350 | static int __init vhci_init(void) |
350 | { | 351 | { |
351 | BT_INFO("Virtual HCI driver ver %s", VERSION); | 352 | BT_INFO("Virtual HCI driver ver %s", VERSION); |
352 | 353 | ||
353 | vhci_miscdev.minor = minor; | ||
354 | |||
355 | if (misc_register(&vhci_miscdev) < 0) { | 354 | if (misc_register(&vhci_miscdev) < 0) { |
356 | BT_ERR("Can't register misc device with minor %d", minor); | 355 | BT_ERR("Can't register misc device with minor %d", minor); |
357 | return -EIO; | 356 | return -EIO; |
@@ -369,9 +368,6 @@ static void __exit vhci_exit(void) | |||
369 | module_init(vhci_init); | 368 | module_init(vhci_init); |
370 | module_exit(vhci_exit); | 369 | module_exit(vhci_exit); |
371 | 370 | ||
372 | module_param(minor, int, 0444); | ||
373 | MODULE_PARM_DESC(minor, "Miscellaneous minor device number"); | ||
374 | |||
375 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); | 371 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
376 | MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); | 372 | MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); |
377 | MODULE_VERSION(VERSION); | 373 | MODULE_VERSION(VERSION); |