leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Use switch statement for Intel hardware variants

Browse Source 
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>
This commit is contained in:
Tedd Ho-Jeong An 2017-03-06 15:38:26 -08:00 committed by Marcel Holtmann
parent d8edd9ed15
commit 9268834b60
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/bluetooth/btusb.c
View File

@ -2024,13 +2024,17 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
return -EINVAL; return -EINVAL;
} }
/* At the moment the iBT 3.0 hardware variants 0x0b (LnP/SfP) /* Check for supported iBT hardware variants of this firmware
* and 0x0c (WsP) are supported by this firmware loading method. * loading method.
* *
* This check has been put in place to ensure correct forward * This check has been put in place to ensure correct forward
* compatibility options when newer hardware variants come along. * 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)", BT_ERR("%s: Unsupported Intel hardware variant (%u)",
hdev->name, ver.hw_variant); hdev->name, ver.hw_variant);
return -EINVAL; return -EINVAL;

17
drivers/bluetooth/hci_intel.c
View File

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