diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-06-07 20:09:57 +0400 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-06-08 16:50:01 +0400 |
| commit | ac28494c51ad20c7ff9cb991eaeee359a500d88e (patch) | |
| tree | 44a637f288705423c9ff74a103eea98a31b393ff /drivers/bluetooth | |
| parent | b4324b5dc5b62ba76372e1bf8927230cf744df66 (diff) | |
| download | linux-ac28494c51ad20c7ff9cb991eaeee359a500d88e.tar.xz | |
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 @@ #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> -#define VERSION "1.2" +#define VERSION "1.3" static int minor = MISC_DYNAMIC_MINOR; @@ -342,16 +342,15 @@ static const struct file_operations vhci_fops = { }; static struct miscdevice vhci_miscdev= { - .name = "vhci", - .fops = &vhci_fops, + .name = "vhci", + .fops = &vhci_fops, + .minor = MISC_DYNAMIC_MINOR, }; static int __init vhci_init(void) { BT_INFO("Virtual HCI driver ver %s", VERSION); - vhci_miscdev.minor = minor; - if (misc_register(&vhci_miscdev) < 0) { BT_ERR("Can't register misc device with minor %d", minor); return -EIO; @@ -369,9 +368,6 @@ static void __exit vhci_exit(void) module_init(vhci_init); module_exit(vhci_exit); -module_param(minor, int, 0444); -MODULE_PARM_DESC(minor, "Miscellaneous minor device number"); - MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); MODULE_VERSION(VERSION); |