aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/bluetooth/hci_vhci.c12
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
45static int minor = MISC_DYNAMIC_MINOR; 45static int minor = MISC_DYNAMIC_MINOR;
46 46
@@ -342,16 +342,15 @@ static const struct file_operations vhci_fops = {
342}; 342};
343 343
344static struct miscdevice vhci_miscdev= { 344static 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
349static int __init vhci_init(void) 350static 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)
369module_init(vhci_init); 368module_init(vhci_init);
370module_exit(vhci_exit); 369module_exit(vhci_exit);
371 370
372module_param(minor, int, 0444);
373MODULE_PARM_DESC(minor, "Miscellaneous minor device number");
374
375MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); 371MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
376MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION); 372MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
377MODULE_VERSION(VERSION); 373MODULE_VERSION(VERSION);