From nobody Thu Dec 18 00:07:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 945D7C07E8C for ; Wed, 16 Aug 2023 08:07:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242735AbjHPIHU (ORCPT ); Wed, 16 Aug 2023 04:07:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242758AbjHPIHC (ORCPT ); Wed, 16 Aug 2023 04:07:02 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36F2E26B5 for ; Wed, 16 Aug 2023 01:06:54 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-31757edd9edso5187935f8f.2 for ; Wed, 16 Aug 2023 01:06:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692173213; x=1692778013; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ByfchL67MEakNAolZmhe0ZErS2p5w+oQPj6R/BMPPgs=; b=rkxr4LhFDyUbXR+Un0ffwU5kpWg9U3n/AZOiwiavpCNjs84Ne4HB2ib9qi1r+qkLt8 p7nv/oADfI4WywewjuckBv3JdC6DRn1qCzU0sh1YmHIRCXnTPajwwff2iXdzx9WCdN1k 1IygJqySIcCPCP5HrFqc4w9s4EWeCZ9k3ZP6lSnCjrKlAcirbV7D7Zdji+maN43cgxIq irNhKZ9nqMKAp/okinwJhfTR8GLSFxpXbjNNRBO8Sg0LOi4jIxw9VB7t4+9NAgSpUYXy ZvElUTJ+TOQqo6ubs+DS9sHkUW1JjQID4CY9VZFCx0OrClWXIJM28FPlD7PxxmHjLKue cj2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692173213; x=1692778013; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ByfchL67MEakNAolZmhe0ZErS2p5w+oQPj6R/BMPPgs=; b=Z8itFZcuukUgKFCy1en//VBZgy4rRqybqwHYAiljWQndp2bACN4VVR2RUrNx7/eIVt pIsNVLWy05p4cwHwnoUhnu9yy9yB4JWQQsql2QpZpSfSsSGLeYRf2HZy48OMFNsG88He 0+I7MBGoVt5PlBZuSGo2wbUzZJNQj8k+xk/94j9tiMJXQ0t3Un9D0YGhrQV0551IAreH orZx20eGJADwUjtenIJih6BCt2damkcMi9YH0VjVYbm4k7MnLntpKTa2Ivkg8afDRPxf 3c2EZFyV4DGobgqDc/9eVAbUQXn8DgD73eGKI+AMZUdURUVeInazv0z3nlCd+O57K0/5 NUTA== X-Gm-Message-State: AOJu0Yy1YFLQV27U4Nl1UMXvlqByacbMln+39smhrktu+L/OFaBeLMei g4azq0+W5HMue2qlBT5ZZxzEqQ== X-Google-Smtp-Source: AGHT+IHRS+gyz6WE/+P1lgnIn2liu91oIezUsTfoHhlO3flUaWmOe1DE0r0wI4aVkQomR29U2Vlf+g== X-Received: by 2002:a5d:680b:0:b0:314:11fe:c72e with SMTP id w11-20020a5d680b000000b0031411fec72emr804694wru.46.1692173212677; Wed, 16 Aug 2023 01:06:52 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id x5-20020adfdcc5000000b00317878d83c6sm20430428wrm.72.2023.08.16.01.06.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 01:06:52 -0700 (PDT) From: Neil Armstrong Date: Wed, 16 Aug 2023 10:06:47 +0200 Subject: [PATCH v4 2/3] Bluetooth: qca: use switch case for soc type behavior MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230816-topic-sm8550-upstream-bt-v4-2-2ea2212719f6@linaro.org> References: <20230816-topic-sm8550-upstream-bt-v4-0-2ea2212719f6@linaro.org> In-Reply-To: <20230816-topic-sm8550-upstream-bt-v4-0-2ea2212719f6@linaro.org> To: Luiz Augusto von Dentz , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Marcel Holtmann , Johan Hedberg , Andy Gross , Bjorn Andersson , Konrad Dybcio , Balakrishna Godavarthi , Rocky Liao Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=16633; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=o4ZXh+HcPs+nqRUJVUqLPiF6o3LMBLAwz50HKrWQJKU=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBk3IOXsX2k7UNYm0Xb/PeD5F4R34BPidJKsP2jjLfV yBnFCBWJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZNyDlwAKCRB33NvayMhJ0XljD/ 47oskbJDp3iBYUv1MSjXhKXXQqLs5JL5SsA+lOtdzaxzy1G/XMP1gQQmPPw0nZDReIJTzRK74N29sj pyGHueivCKJiZ2CFTsLbdoeFJHbfUmXIUYJu63l5VYcq2TAdgrddEIqX8wFRBV/N62j1DkCWX+ECHW kDsoF28kWCXVnjFJpgWXu3IVmC7mMQOqpqN5WFdnmsdz/B8cBgGR0/krhwNd9Wdt3MiYaXRiIcUXDQ dNXw3XjqtJX9MEjbIWBoXuyekccR5US2PPpR2XeYr2J32aRtgiOMoDSwVLwMch5ANzCEvZOpqYoxTv qN4aSaz2f/i+bw4KvWuuUlxq5DlsZqIM0Gnk7iUKqcp5uE2L05JHGxgmpLnPDpeQcEO7YNAt07Fckk EnnyYFGnrmNOTf2jubFNNCNTyIif2jRFuxHrjc1j84tgWk9821JhITHYjidaUv4auHA834slX3AZfc KD0Tmc1xiPBsyfnsQSOEMJ1xzVq/0t8QjdhsGk00d+DXC2tyqYmkglCnVCBqOV6C+5x7AruVpbN8E+ 1la1oqmiIztpd9XNjYcNycsqunYB5GmnhQQxkUtnAA1h3N3RaZkUWGcS/GShKseZcJI784+tL21ox2 NquWjxs96iXnJaIwUIvOMcGTBw/2swOllKeVk1kpIJ+rkou//Y2Kk/O0g7ZA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use switch/case to handle soc type specific behaviour, the permit dropping the qca_is_xxx() inline functions and make the code clearer and easier to update for new SoCs. Suggested-by: Konrad Dybcio Suggested-by: Luiz Augusto von Dentz Signed-off-by: Neil Armstrong --- drivers/bluetooth/btqca.c | 87 +++++++++++------ drivers/bluetooth/btqca.h | 36 ------- drivers/bluetooth/hci_qca.c | 233 ++++++++++++++++++++++++++++++++++------= ---- 3 files changed, 236 insertions(+), 120 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index 6f2187fab55f..e301f571e971 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -604,26 +604,34 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baud= rate, =20 /* Download rampatch file */ config.type =3D TLV_TYPE_PATCH; - if (soc_type =3D=3D QCA_WCN3988) { - snprintf(config.fwname, sizeof(config.fwname), - "qca/apbtfw%02x.tlv", rom_ver); - } else if (qca_is_wcn399x(soc_type)) { + switch (soc_type) { + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: snprintf(config.fwname, sizeof(config.fwname), "qca/crbtfw%02x.tlv", rom_ver); - } else if (soc_type =3D=3D QCA_QCA6390) { + break; + case QCA_WCN3988: + snprintf(config.fwname, sizeof(config.fwname), + "qca/apbtfw%02x.tlv", rom_ver); + break; + case QCA_QCA6390: snprintf(config.fwname, sizeof(config.fwname), "qca/htbtfw%02x.tlv", rom_ver); - } else if (soc_type =3D=3D QCA_WCN6750) { + break; + case QCA_WCN6750: /* Choose mbn file by default.If mbn file is not found * then choose tlv file */ config.type =3D ELF_TYPE_PATCH; snprintf(config.fwname, sizeof(config.fwname), "qca/msbtfw%02x.mbn", rom_ver); - } else if (soc_type =3D=3D QCA_WCN6855) { + break; + case QCA_WCN6855: snprintf(config.fwname, sizeof(config.fwname), "qca/hpbtfw%02x.tlv", rom_ver); - } else { + break; + default: snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin", soc_ver); } @@ -639,33 +647,44 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baud= rate, =20 /* Download NVM configuration */ config.type =3D TLV_TYPE_NVM; - if (firmware_name) + if (firmware_name) { snprintf(config.fwname, sizeof(config.fwname), "qca/%s", firmware_name); - else if (soc_type =3D=3D QCA_WCN3988) - snprintf(config.fwname, sizeof(config.fwname), - "qca/apnv%02x.bin", rom_ver); - else if (qca_is_wcn399x(soc_type)) { - if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3991_SOC_ID) { + } else { + switch (soc_type) { + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3991_SOC_ID) { + snprintf(config.fwname, sizeof(config.fwname), + "qca/crnv%02xu.bin", rom_ver); + } else { + snprintf(config.fwname, sizeof(config.fwname), + "qca/crnv%02x.bin", rom_ver); + } + break; + case QCA_WCN3988: snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02xu.bin", rom_ver); - } else { + "qca/apnv%02x.bin", rom_ver); + break; + case QCA_QCA6390: + snprintf(config.fwname, sizeof(config.fwname), + "qca/htnv%02x.bin", rom_ver); + break; + case QCA_WCN6750: + snprintf(config.fwname, sizeof(config.fwname), + "qca/msnv%02x.bin", rom_ver); + break; + case QCA_WCN6855: + snprintf(config.fwname, sizeof(config.fwname), + "qca/hpnv%02x.bin", rom_ver); + break; + + default: snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02x.bin", rom_ver); + "qca/nvm_%08x.bin", soc_ver); } } - else if (soc_type =3D=3D QCA_QCA6390) - snprintf(config.fwname, sizeof(config.fwname), - "qca/htnv%02x.bin", rom_ver); - else if (soc_type =3D=3D QCA_WCN6750) - snprintf(config.fwname, sizeof(config.fwname), - "qca/msnv%02x.bin", rom_ver); - else if (soc_type =3D=3D QCA_WCN6855) - snprintf(config.fwname, sizeof(config.fwname), - "qca/hpnv%02x.bin", rom_ver); - else - snprintf(config.fwname, sizeof(config.fwname), - "qca/nvm_%08x.bin", soc_ver); =20 err =3D qca_download_firmware(hdev, &config, soc_type, rom_ver); if (err < 0) { @@ -673,16 +692,24 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baud= rate, return err; } =20 - if (soc_type >=3D QCA_WCN3991) { + switch (soc_type) { + case QCA_WCN3991: + case QCA_QCA6390: + case QCA_WCN6750: + case QCA_WCN6855: err =3D qca_disable_soc_logging(hdev); if (err < 0) return err; + break; + default: + break; } =20 /* WCN399x and WCN6750 supports the Microsoft vendor extension with 0xFD7= 0 as the * VsMsftOpCode. */ switch (soc_type) { + case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: case QCA_WCN3998: diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index fc6cf314eb0e..fe51c632d772 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -161,27 +161,6 @@ int qca_read_soc_version(struct hci_dev *hdev, struct = qca_btsoc_version *ver, enum qca_btsoc_type); int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr); int qca_send_pre_shutdown_cmd(struct hci_dev *hdev); -static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type) -{ - switch (soc_type) { - case QCA_WCN3988: - case QCA_WCN3990: - case QCA_WCN3991: - case QCA_WCN3998: - return true; - default: - return false; - } -} -static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type) -{ - return soc_type =3D=3D QCA_WCN6750; -} -static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type) -{ - return soc_type =3D=3D QCA_WCN6855; -} - #else =20 static inline int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t= *bdaddr) @@ -209,21 +188,6 @@ static inline int qca_set_bdaddr(struct hci_dev *hdev,= const bdaddr_t *bdaddr) return -EOPNOTSUPP; } =20 -static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type) -{ - return false; -} - -static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type) -{ - return false; -} - -static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type) -{ - return false; -} - static inline int qca_send_pre_shutdown_cmd(struct hci_dev *hdev) { return -EOPNOTSUPP; diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 011822519602..548157119b75 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -607,9 +607,18 @@ static int qca_open(struct hci_uart *hu) if (hu->serdev) { qcadev =3D serdev_device_get_drvdata(hu->serdev); =20 - if (qca_is_wcn399x(qcadev->btsoc_type) || - qca_is_wcn6750(qcadev->btsoc_type)) + switch (qcadev->btsoc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: hu->init_speed =3D qcadev->init_speed; + break; + + default: + break; + } =20 if (qcadev->oper_speed) hu->oper_speed =3D qcadev->oper_speed; @@ -1341,12 +1350,19 @@ static int qca_set_baudrate(struct hci_dev *hdev, u= int8_t baudrate) msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS)); =20 /* Give the controller time to process the request */ - if (qca_is_wcn399x(qca_soc_type(hu)) || - qca_is_wcn6750(qca_soc_type(hu)) || - qca_is_wcn6855(qca_soc_type(hu))) + switch (qca_soc_type(hu)) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: usleep_range(1000, 10000); - else + break; + + default: msleep(300); + } =20 return 0; } @@ -1419,13 +1435,19 @@ static unsigned int qca_get_speed(struct hci_uart *= hu, =20 static int qca_check_speeds(struct hci_uart *hu) { - if (qca_is_wcn399x(qca_soc_type(hu)) || - qca_is_wcn6750(qca_soc_type(hu)) || - qca_is_wcn6855(qca_soc_type(hu))) { + switch (qca_soc_type(hu)) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: if (!qca_get_speed(hu, QCA_INIT_SPEED) && !qca_get_speed(hu, QCA_OPER_SPEED)) return -EINVAL; - } else { + break; + + default: if (!qca_get_speed(hu, QCA_INIT_SPEED) || !qca_get_speed(hu, QCA_OPER_SPEED)) return -EINVAL; @@ -1454,14 +1476,28 @@ static int qca_set_speed(struct hci_uart *hu, enum = qca_speed_type speed_type) /* Disable flow control for wcn3990 to deassert RTS while * changing the baudrate of chip and host. */ - if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: hci_uart_set_flow_control(hu, true); + break; =20 - if (soc_type =3D=3D QCA_WCN3990) { + default: + break; + } + + switch (soc_type) { + case QCA_WCN3990: reinit_completion(&qca->drop_ev_comp); set_bit(QCA_DROP_VENDOR_EVENT, &qca->flags); + break; + + default: + break; } =20 qca_baudrate =3D qca_get_baudrate_value(speed); @@ -1473,12 +1509,22 @@ static int qca_set_speed(struct hci_uart *hu, enum = qca_speed_type speed_type) host_set_baudrate(hu, speed); =20 error: - if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: hci_uart_set_flow_control(hu, false); + break; =20 - if (soc_type =3D=3D QCA_WCN3990) { + default: + break; + } + + switch (soc_type) { + case QCA_WCN3990: /* Wait for the controller to send the vendor event * for the baudrate change command. */ @@ -1490,6 +1536,10 @@ static int qca_set_speed(struct hci_uart *hu, enum q= ca_speed_type speed_type) } =20 clear_bit(QCA_DROP_VENDOR_EVENT, &qca->flags); + break; + + default: + break; } } =20 @@ -1651,12 +1701,20 @@ static int qca_regulator_init(struct hci_uart *hu) } } =20 - if (qca_is_wcn399x(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: /* Forcefully enable wcn399x to enter in to boot mode. */ host_set_baudrate(hu, 2400); ret =3D qca_send_power_pulse(hu, false); if (ret) return ret; + break; + + default: + break; } =20 /* For wcn6750 need to enable gpio bt_en */ @@ -1673,10 +1731,18 @@ static int qca_regulator_init(struct hci_uart *hu) =20 qca_set_speed(hu, QCA_INIT_SPEED); =20 - if (qca_is_wcn399x(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: ret =3D qca_send_power_pulse(hu, true); if (ret) return ret; + break; + + default: + break; } =20 /* Now the device is in ready state to communicate with host. @@ -1710,11 +1776,17 @@ static int qca_power_on(struct hci_dev *hdev) if (!hu->serdev) return 0; =20 - if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: ret =3D qca_regulator_init(hu); - } else { + break; + + default: qcadev =3D serdev_device_get_drvdata(hu->serdev); if (qcadev->bt_en) { gpiod_set_value_cansleep(qcadev->bt_en, 1); @@ -1748,6 +1820,7 @@ static int qca_setup(struct hci_uart *hu) const char *firmware_name =3D qca_get_firmware_name(hu); int ret; struct qca_btsoc_version ver; + const char *soc_name; =20 ret =3D qca_check_speeds(hu); if (ret) @@ -1762,10 +1835,26 @@ static int qca_setup(struct hci_uart *hu) */ set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); =20 - bt_dev_info(hdev, "setting up %s", - qca_is_wcn399x(soc_type) ? "wcn399x" : - (soc_type =3D=3D QCA_WCN6750) ? "wcn6750" : - (soc_type =3D=3D QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390"); + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + soc_name =3D "wcn399x"; + break; + + case QCA_WCN6750: + soc_name =3D "wcn6750"; + break; + + case QCA_WCN6855: + soc_name =3D "wcn6855"; + break; + + default: + soc_name =3D "ROME/QCA6390"; + } + bt_dev_info(hdev, "setting up %s", soc_name); =20 qca->memdump_state =3D QCA_MEMDUMP_IDLE; =20 @@ -1776,16 +1865,22 @@ static int qca_setup(struct hci_uart *hu) =20 clear_bit(QCA_SSR_TRIGGERED, &qca->flags); =20 - if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); hci_set_aosp_capable(hdev); =20 ret =3D qca_read_soc_version(hdev, &ver, soc_type); if (ret) goto out; - } else { + break; + + default: qca_set_speed(hu, QCA_INIT_SPEED); } =20 @@ -1799,9 +1894,16 @@ static int qca_setup(struct hci_uart *hu) qca_baudrate =3D qca_get_baudrate_value(speed); } =20 - if (!(qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type))) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: + break; + + default: /* Get QCA version information */ ret =3D qca_read_soc_version(hdev, &ver, soc_type); if (ret) @@ -1980,11 +2082,18 @@ static void qca_power_shutdown(struct hci_uart *hu) =20 qcadev =3D serdev_device_get_drvdata(hu->serdev); =20 - if (qca_is_wcn399x(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: host_set_baudrate(hu, 2400); qca_send_power_pulse(hu, false); qca_regulator_disable(qcadev); - } else if (soc_type =3D=3D QCA_WCN6750 || soc_type =3D=3D QCA_WCN6855) { + break; + + case QCA_WCN6750: + case QCA_WCN6855: gpiod_set_value_cansleep(qcadev->bt_en, 0); msleep(100); qca_regulator_disable(qcadev); @@ -1992,7 +2101,9 @@ static void qca_power_shutdown(struct hci_uart *hu) sw_ctrl_state =3D gpiod_get_value_cansleep(qcadev->sw_ctrl); bt_dev_dbg(hu->hdev, "SW_CTRL is %d", sw_ctrl_state); } - } else if (qcadev->bt_en) { + break; + + default: gpiod_set_value_cansleep(qcadev->bt_en, 0); } =20 @@ -2117,11 +2228,18 @@ static int qca_serdev_probe(struct serdev_device *s= erdev) if (!qcadev->oper_speed) BT_DBG("UART will pick default operating speed"); =20 - if (data && - (qca_is_wcn399x(data->soc_type) || - qca_is_wcn6750(data->soc_type) || - qca_is_wcn6855(data->soc_type))) { + if (data) qcadev->btsoc_type =3D data->soc_type; + else + qcadev->btsoc_type =3D QCA_ROME; + + switch (qcadev->btsoc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: qcadev->bt_power =3D devm_kzalloc(&serdev->dev, sizeof(struct qca_power), GFP_KERNEL); @@ -2165,12 +2283,9 @@ static int qca_serdev_probe(struct serdev_device *se= rdev) BT_ERR("wcn3990 serdev registration failed"); return err; } - } else { - if (data) - qcadev->btsoc_type =3D data->soc_type; - else - qcadev->btsoc_type =3D QCA_ROME; + break; =20 + default: qcadev->bt_en =3D devm_gpiod_get_optional(&serdev->dev, "enable", GPIOD_OUT_LOW); if (IS_ERR_OR_NULL(qcadev->bt_en)) { @@ -2226,13 +2341,23 @@ static void qca_serdev_remove(struct serdev_device = *serdev) struct qca_serdev *qcadev =3D serdev_device_get_drvdata(serdev); struct qca_power *power =3D qcadev->bt_power; =20 - if ((qca_is_wcn399x(qcadev->btsoc_type) || - qca_is_wcn6750(qcadev->btsoc_type) || - qca_is_wcn6855(qcadev->btsoc_type)) && - power->vregs_on) - qca_power_shutdown(&qcadev->serdev_hu); - else if (qcadev->susclk) - clk_disable_unprepare(qcadev->susclk); + switch (qcadev->btsoc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: + if (power->vregs_on) { + qca_power_shutdown(&qcadev->serdev_hu); + break; + } + fallthrough; + + default: + if (qcadev->susclk) + clk_disable_unprepare(qcadev->susclk); + } =20 hci_uart_unregister_device(&qcadev->serdev_hu); } --=20 2.34.1