Bluetooth: Rename HCI_BREDR into HCI_PRIMARY

The HCI_BREDR naming is confusing since it actually stands for Primary
Bluetooth Controller. Which is a term that has been used in the latest
standard. However from a legacy point of view there only really have
been Basic Rate (BR) and Enhanced Data Rate (EDR). Recent versions of
Bluetooth introduced Low Energy (LE) and made this terminology a little
bit confused since Dual Mode Controllers include BR/EDR and LE. To
simplify this the name HCI_PRIMARY stands for the Primary Controller
which can be a single mode or dual mode controller.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

5 files changed, 7 insertions, 7 deletions

diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 7ad8d61c0c61..e6a85f0e6309 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -138,7 +138,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
                         if (event->length > 3 && event->data[3])
                                 priv->btmrvl_dev.dev_type = HCI_AMP;
                         else
-                                priv->btmrvl_dev.dev_type = HCI_BREDR;
+                                priv->btmrvl_dev.dev_type = HCI_PRIMARY;
 
                         BT_DBG("dev_type: %d", priv->btmrvl_dev.dev_type);
                 } else if (priv->btmrvl_dev.sendcmdflag &&
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 2b05661e3818..1cb958e199eb 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -311,7 +311,7 @@ static int btsdio_probe(struct sdio_func *func,
         if (id->class == SDIO_CLASS_BT_AMP)
                 hdev->dev_type = HCI_AMP;
         else
-                hdev->dev_type = HCI_BREDR;
+                hdev->dev_type = HCI_PRIMARY;
 
         data->hdev = hdev;
 
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 880bb5546b25..f2e8fd701bf6 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2832,7 +2832,7 @@ static int btusb_probe(struct usb_interface *intf,
         if (id->driver_info & BTUSB_AMP)
                 hdev->dev_type = HCI_AMP;
         else
-                hdev->dev_type = HCI_BREDR;
+                hdev->dev_type = HCI_PRIMARY;
 
         data->hdev = hdev;
 
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 49b3e1e2d236..dda97398c59a 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -609,7 +609,7 @@ static int hci_uart_register_dev(struct hci_uart *hu)
         if (test_bit(HCI_UART_CREATE_AMP, &hu->hdev_flags))
                 hdev->dev_type = HCI_AMP;
         else
-                hdev->dev_type = HCI_BREDR;
+                hdev->dev_type = HCI_PRIMARY;
 
         if (test_bit(HCI_UART_INIT_PENDING, &hu->hdev_flags))
                 return 0;
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index aba31210c802..3ff229b2e7f3 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -97,10 +97,10 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode)
         if (data->hdev)
                 return -EBADFD;
 
-        /* bits 0-1 are dev_type (BR/EDR or AMP) */
+        /* bits 0-1 are dev_type (Primary or AMP) */
         dev_type = opcode & 0x03;
 
-        if (dev_type != HCI_BREDR && dev_type != HCI_AMP)
+        if (dev_type != HCI_PRIMARY && dev_type != HCI_AMP)
                 return -EINVAL;
 
         /* bits 2-5 are reserved (must be zero) */
@@ -316,7 +316,7 @@ static void vhci_open_timeout(struct work_struct *work)
         struct vhci_data *data = container_of(work, struct vhci_data,
                                               open_timeout.work);
 
-        vhci_create_device(data, amp ? HCI_AMP : HCI_BREDR);
+        vhci_create_device(data, amp ? HCI_AMP : HCI_PRIMARY);
 }
 
 static int vhci_open(struct inode *inode, struct file *file)