diff options
| author | Tedd Ho-Jeong An | 2017-03-07 00:38:26 +0100 |
|---|---|---|
| committer | Marcel Holtmann | 2017-04-12 22:02:37 +0200 |
| commit | 9268834b60c0b08101c7a8522b6901cf4cd57a14 (patch) | |
| tree | 8c71b035f8282ca8e08de3fac3ff989ebb24cd81 /drivers/bluetooth/btusb.c | |
| parent | Bluetooth: L2CAP: Fix L2CAP_CR_SCID_IN_USE value (diff) | |
| download | kernel-qcow2-linux-9268834b60c0b08101c7a8522b6901cf4cd57a14.tar.gz kernel-qcow2-linux-9268834b60c0b08101c7a8522b6901cf4cd57a14.tar.xz kernel-qcow2-linux-9268834b60c0b08101c7a8522b6901cf4cd57a14.zip | |
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>
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 1c8094ef3f22..b599be805eb3 100644 --- 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; |