Bluetooth: Use switch statement for Intel hardware variants

Multiple new hardware variants are planned and the simple if statement
would get really complicated and unreadable. So instead replace it with
a simple switch statement.

The change is applied to both USB and UART.

Based-on-patch-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 1c8094ef3f228414bb427c258b9201034e01004d..b599be805eb39a3b58812f4af983e4fac58cd43b 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2024,13 +2024,17 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
                return -EINVAL;
        }
 
-       /* At the moment the iBT 3.0 hardware variants 0x0b (LnP/SfP)
-        * and 0x0c (WsP) are supported by this firmware loading method.
+       /* Check for supported iBT hardware variants of this firmware
+        * loading method.
         *
         * This check has been put in place to ensure correct forward
         * compatibility options when newer hardware variants come along.
         */
-       if (ver.hw_variant != 0x0b && ver.hw_variant != 0x0c) {
+       switch (ver.hw_variant) {
+       case 0x0b:      /* SfP */
+       case 0x0c:      /* WsP */
+               break;
+       default:
                BT_ERR("%s: Unsupported Intel hardware variant (%u)",
                       hdev->name, ver.hw_variant);
                return -EINVAL;

diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
index 9e271286c5e553dbd6112f8a83393c8bf5b5dd43..bfd718c58d996baa0fef968b840e907db8728ccd 100644 (file)
--- a/drivers/bluetooth/hci_intel.c
+++ b/drivers/bluetooth/hci_intel.c
@@ -601,12 +601,17 @@ static int intel_setup(struct hci_uart *hu)
                return -EINVAL;
        }
 
-       /* At the moment only the hardware variant iBT 3.0 (LnP/SfP) is
-        * supported by this firmware loading method. This check has been
-        * put in place to ensure correct forward compatibility options
-        * when newer hardware variants come along.
-        */
-       if (ver.hw_variant != 0x0b) {
+        /* Check for supported iBT hardware variants of this firmware
+         * loading method.
+         *
+         * This check has been put in place to ensure correct forward
+         * compatibility options when newer hardware variants come along.
+         */
+       switch (ver.hw_variant) {
+       case 0x0b:      /* LnP */
+       case 0x0c:      /* WsP */
+               break;
+       default:
                bt_dev_err(hdev, "Unsupported Intel hardware variant (%u)",
                           ver.hw_variant);
                return -EINVAL;