From patchwork Thu Jul 27 04:40:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Jiang X-Patchwork-Id: 707127 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 06CB4EB64DD for ; Thu, 27 Jul 2023 04:40:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230364AbjG0Ekd (ORCPT ); Thu, 27 Jul 2023 00:40:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230335AbjG0Ekd (ORCPT ); Thu, 27 Jul 2023 00:40:33 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20926135; Wed, 26 Jul 2023 21:40:32 -0700 (PDT) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36R3kVed025853; Thu, 27 Jul 2023 04:40:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=mL8lE5d0tWKCdN3vbxMyTY+IafpWbFSLDHQhQSLceL4=; b=e7zOXsJ9o//Ce2l2/DAIJJ66CNec7fdWhOHhye/Rbwq1tNALW8F7SaRMIzYGo/3OJ9EV dcx6/AKYSRc4U9XSFQGV3pz71WBgJ291E4mf5Z2vLrK1ZdY2vOf3VvX4YrMedrDtWRhb 0Nrnyx2RNzxIgh47RNj1X0H6sTcep0n3mbL8KbEIonHowDYvvRdEL4/Zdxcgjkf024y6 NEReDyE/SyNrWY6wsbRe0YZ/UdHP3a1poxox7Q01DdHTy8F9Y+gfuPY0/ulgIoVujcUs O4vOsdJTaGDUPA78N+boS4xa0SNr+RE8Hhau7zn0/NdDUvKLQV6tCPhdbhnx9e0w3m6t uQ== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s32jn1stj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Jul 2023 04:40:27 +0000 Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36R4ePqJ011704 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Jul 2023 04:40:26 GMT Received: from tjiang-gv.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Wed, 26 Jul 2023 21:40:23 -0700 From: Tim Jiang To: CC: , , , , , , , , Subject: [PATCH v13 1/2] Bluetooth: hci_qca: adjust qca btsoc type print expression Date: Thu, 27 Jul 2023 12:40:10 +0800 Message-ID: <20230727044011.965205-2-quic_tjiang@quicinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230727044011.965205-1-quic_tjiang@quicinc.com> References: <20230727044011.965205-1-quic_tjiang@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: -_Qawn15NKISuB0dkQ5ipk9LGo51QKbS X-Proofpoint-ORIG-GUID: -_Qawn15NKISuB0dkQ5ipk9LGo51QKbS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-26_08,2023-07-26_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 clxscore=1015 suspectscore=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 lowpriorityscore=0 impostorscore=0 adultscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307270042 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This patch make the print btsoc type expression more clearly. Signed-off-by: Tim Jiang --- drivers/bluetooth/hci_qca.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 9b785c947d96..e11d47210e80 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1748,6 +1748,7 @@ static int qca_setup(struct hci_uart *hu) const char *firmware_name = qca_get_firmware_name(hu); int ret; struct qca_btsoc_version ver; + const char *soc_name; ret = qca_check_speeds(hu); if (ret) @@ -1762,10 +1763,32 @@ static int qca_setup(struct hci_uart *hu) */ set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); - bt_dev_info(hdev, "setting up %s", - qca_is_wcn399x(soc_type) ? "wcn399x" : - (soc_type == QCA_WCN6750) ? "wcn6750" : - (soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390"); + switch (soc_type) { + case QCA_AR3002: + soc_name = "ar300x"; + break; + case QCA_ROME: + soc_name = "ROME"; + break; + case QCA_QCA6390: + soc_name = "QCA6390"; + break; + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + soc_name = "wcn399x"; + break; + case QCA_WCN6750: + soc_name = "wcn6750"; + break; + case QCA_WCN6855: + soc_name = "wcn6855"; + break; + default: + soc_name = "unknown soc"; + break; + } + bt_dev_info(hdev, "setting up %s", soc_name); qca->memdump_state = QCA_MEMDUMP_IDLE;