Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp2123777rwb; Thu, 27 Jul 2023 02:21:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlHduCJ9mCa1bvqAyZBYhhlNUeOSQA8Kkxtd3u8l+xDSDx8I8PKTZtGiGnlfaOwuS6Ka5eRK X-Received: by 2002:a17:902:c40c:b0:1b6:797d:33fb with SMTP id k12-20020a170902c40c00b001b6797d33fbmr5135808plk.64.1690449701874; Thu, 27 Jul 2023 02:21:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690449701; cv=none; d=google.com; s=arc-20160816; b=JeLxb8JlZVkf7oaYgivYOewjplLlTQtiHavEp2U/hKFuVJZFrbo9lLkk1YMe3+b1uf ng7HYa4Z25x8ubddEMI+Nsknaf0zouHYnLEldBIPZ+WOk6xKNQDv/TfwQnK7JotC6S6B s1LJBlMLJbxFm+evOqo6/MZusKfN39Eikr6playJDpkrzBYVW5eowbcB2EvlT4mSLZf+ wr1cpNMz8mQH5/Orr+nkKUN4IrC0aqSQI4K7shEY7VG48mAloW8Iy/D8BMmAX1bC+Gd+ ew9jyCDwGN1zDddGUvtBGl5ld6Uje05hDSqSRj2Am2r1XSkntWdj3Tv46rkyObW3n8K9 qSlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mL8lE5d0tWKCdN3vbxMyTY+IafpWbFSLDHQhQSLceL4=; fh=WtcaZlrDlBN2ejsJMd0YH0FL1I2V7rNWfYNuvHbhwHE=; b=0EDu8b3p+hRZVWLe33Kpmo6z3kelPuMeFRjuZVbxg7ASU0gTcjrU6sbXfjJPO9lh0h PTsIOp2mjvut+UspwUpJvE4CShQJ6nkoc+DISyjXVXx5Z8VhYwCZy5rEou9baiQWxRk8 67NOJxDbHx73GONmsdrQvMtt0b+3xWt//iRv+ya5X6pV4KUwkQlKpyjhelN9zAF+4HiC v9NNIYMLD76bYbnygD2JTlCcKauAdIDct3t/yJJaB8Ta4EgwlQptfBdv1ZFz9F2fFw4/ OWp0iqVDlx9VdfQLa3AEaGCvwnwWFebkaj5tsJTzh8FWEUmBAwS+f7j0ZzSHO2Rhpevb lF7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=DaAkl4o2; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a7-20020a170902ecc700b001bb9a1cf6casi1007204plh.405.2023.07.27.02.21.23; Thu, 27 Jul 2023 02:21:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=DaAkl4o2; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232561AbjG0JFr (ORCPT + 99 others); Thu, 27 Jul 2023 05:05:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231451AbjG0JFZ (ORCPT ); Thu, 27 Jul 2023 05:05:25 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4524F83CC; Thu, 27 Jul 2023 01:46:19 -0700 (PDT) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36R5mrdB007399; Thu, 27 Jul 2023 08:46:13 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=DaAkl4o2MTJan4/EbU2Cr3x3zBgqc0c1scNpowxdScz1PALO5OOD+K3A1z//MA/USSIS 23BZennb8UhkogfCuKRe33iCm6hkr5z+E79fMWVmhro0/anf2FPxO+ULmVI+KemYEAx7 I7fqZqwyqxXyBgCn3iJ9D8ExUmA+mOOXn6A2OoY1Y1RHV6Up8P/bpAbFPiEWOJ5N4mTH gLpP//2VbOiHOYEzPr0OIh3El0u1AaJta1ERxziql3KsO1oQ8uSHRAc0zKypVnXENcBF Ud5kLQ9g80sjEKbQru5eNctRKk+k0ShfqoWVobNMPOV2NWtlzsN7J7obpnZon5Qncu0k Vg== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s336t2705-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Jul 2023 08:46:13 +0000 Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36R8kClT000895 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Jul 2023 08:46:12 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; Thu, 27 Jul 2023 01:36:08 -0700 From: Tim Jiang To: CC: , , , , , , , , Subject: [PATCH v14 1/2] Bluetooth: hci_qca: adjust qca btsoc type print expression Date: Thu, 27 Jul 2023 16:35:54 +0800 Message-ID: <20230727083555.1023992-2-quic_tjiang@quicinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230727083555.1023992-1-quic_tjiang@quicinc.com> References: <20230727083555.1023992-1-quic_tjiang@quicinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) 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-ORIG-GUID: X__adsKSPk1_x_jjEztNf4f-LtqsiDsl X-Proofpoint-GUID: X__adsKSPk1_x_jjEztNf4f-LtqsiDsl 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 phishscore=0 spamscore=0 clxscore=1015 mlxlogscore=999 adultscore=0 lowpriorityscore=0 suspectscore=0 priorityscore=1501 bulkscore=0 impostorscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307270077 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@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; -- 2.41.0