[Bluetooth] Add HCI device identifier for SDIO cards

This patch assigns the next free HCI device identifier to Bluetooth
devices based on the SDIO interface.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index fc2130f1776a8e1b720fad46cb3e8b5e848fe75e..a278d98a915126a2dac78c6d1865fc11d89181cf 100644 (file)
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -276,7 +276,7 @@ static int vhci_open(struct inode *inode, struct file *file)
 
        data->hdev = hdev;
 
-       hdev->type = HCI_VHCI;
+       hdev->type = HCI_VIRTUAL;
        hdev->driver_data = data;
 
        hdev->open     = vhci_open_dev;

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b2bdb1aa04291c7104113ef93532dcb26c166a44..fde08f452b59fed7ee00a07878c51d0415c6eaac 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -44,12 +44,13 @@
 #define HCI_NOTIFY_VOICE_SETTING       3
 
 /* HCI device types */
-#define HCI_VHCI       0
+#define HCI_VIRTUAL    0
 #define HCI_USB                1
 #define HCI_PCCARD     2
 #define HCI_UART       3
 #define HCI_RS232      4
 #define HCI_PCI                5
+#define HCI_SDIO       6
 
 /* HCI device quirks */
 enum {

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 58df4360d242fc2c3ee80025adb055453bc02b58..09c61615e961b5d423b58bea608282a875705354 100644 (file)
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -16,7 +16,7 @@
 static inline char *typetostr(int type)
 {
        switch (type) {
-       case HCI_VHCI:
+       case HCI_VIRTUAL:
                return "VIRTUAL";
        case HCI_USB:
                return "USB";
@@ -28,6 +28,8 @@ static inline char *typetostr(int type)
                return "RS232";
        case HCI_PCI:
                return "PCI";
+       case HCI_SDIO:
+               return "SDIO";
        default:
                return "UNKNOWN";
        }