Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9268834b authored by Tedd Ho-Jeong An's avatar Tedd Ho-Jeong An Committed by Marcel Holtmann
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarTedd Ho-Jeong An <tedd.an@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent d8edd9ed

drivers/bluetooth/btusb.c

+7 −3
Original line number Diff line number Diff line
@@ -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;

drivers/bluetooth/hci_intel.c

+11 −6
Original line number Diff line number Diff line
@@ -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.

        /* 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) {

	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;