浏览代码

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>
Marcel Holtmann 16 年之前
父节点
当前提交
ac28494c51
共有 1 个文件被更改,包括 4 次插入8 次删除
  1. 4 8
      drivers/bluetooth/hci_vhci.c

+ 4 - 8
drivers/bluetooth/hci_vhci.c

@@ -40,7 +40,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/hci_core.h>
 
 
-#define VERSION "1.2"
+#define VERSION "1.3"
 
 
 static int minor = MISC_DYNAMIC_MINOR;
 static int minor = MISC_DYNAMIC_MINOR;
 
 
@@ -342,16 +342,15 @@ static const struct file_operations vhci_fops = {
 };
 };
 
 
 static struct miscdevice vhci_miscdev= {
 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)
 static int __init vhci_init(void)
 {
 {
 	BT_INFO("Virtual HCI driver ver %s", VERSION);
 	BT_INFO("Virtual HCI driver ver %s", VERSION);
 
 
-	vhci_miscdev.minor = minor;
-
 	if (misc_register(&vhci_miscdev) < 0) {
 	if (misc_register(&vhci_miscdev) < 0) {
 		BT_ERR("Can't register misc device with minor %d", minor);
 		BT_ERR("Can't register misc device with minor %d", minor);
 		return -EIO;
 		return -EIO;
@@ -369,9 +368,6 @@ static void __exit vhci_exit(void)
 module_init(vhci_init);
 module_init(vhci_init);
 module_exit(vhci_exit);
 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_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
 MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
 MODULE_VERSION(VERSION);
 MODULE_VERSION(VERSION);