diff mbox series

[v13,1/2] Bluetooth: hci_qca: adjust qca btsoc type print expression

Message ID 20230727044011.965205-2-quic_tjiang@quicinc.com (mailing list archive)
State Superseded
Headers show
Series Bluetooth: hci_qca: Add support for Qualcomm Bluetooth SoC QCA2066 | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/SubjectPrefix success Gitlint PASS
tedd_an/BuildKernel success BuildKernel PASS
tedd_an/CheckAllWarning success CheckAllWarning PASS
tedd_an/CheckSparse success CheckSparse PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/BuildKernel32 success BuildKernel32 PASS
tedd_an/TestRunnerSetup success TestRunnerSetup PASS
tedd_an/TestRunner_l2cap-tester success TestRunner PASS
tedd_an/TestRunner_iso-tester success TestRunner PASS
tedd_an/TestRunner_bnep-tester success TestRunner PASS
tedd_an/TestRunner_mgmt-tester success TestRunner PASS
tedd_an/TestRunner_rfcomm-tester success TestRunner PASS
tedd_an/TestRunner_sco-tester success TestRunner PASS
tedd_an/TestRunner_ioctl-tester success TestRunner PASS
tedd_an/TestRunner_mesh-tester success TestRunner PASS
tedd_an/TestRunner_smp-tester success TestRunner PASS
tedd_an/TestRunner_userchan-tester success TestRunner PASS
tedd_an/IncrementalBuild success Incremental Build PASS

Commit Message

Tim Jiang July 27, 2023, 4:40 a.m. UTC 
This patch make the print btsoc type expression more clearly.

Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com>
---
 drivers/bluetooth/hci_qca.c | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

Comments

bluez.test.bot@gmail.com July 27, 2023, 5:36 a.m. UTC | #1 
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=769935

---Test result---

Test Summary:
CheckPatch                    PASS      1.65 seconds
GitLint                       PASS      0.56 seconds
SubjectPrefix                 PASS      0.18 seconds
BuildKernel                   PASS      34.31 seconds
CheckAllWarning               PASS      37.18 seconds
CheckSparse                   PASS      42.75 seconds
CheckSmatch                   PASS      114.13 seconds
BuildKernel32                 PASS      33.11 seconds
TestRunnerSetup               PASS      500.76 seconds
TestRunner_l2cap-tester       PASS      23.65 seconds
TestRunner_iso-tester         PASS      43.09 seconds
TestRunner_bnep-tester        PASS      10.88 seconds
TestRunner_mgmt-tester        PASS      223.21 seconds
TestRunner_rfcomm-tester      PASS      16.32 seconds
TestRunner_sco-tester         PASS      17.24 seconds
TestRunner_ioctl-tester       PASS      18.42 seconds
TestRunner_mesh-tester        PASS      13.68 seconds
TestRunner_smp-tester         PASS      14.57 seconds
TestRunner_userchan-tester    PASS      11.33 seconds
IncrementalBuild              PASS      36.64 seconds



---
Regards,
Linux Bluetooth
Johan Hovold July 27, 2023, 7:27 a.m. UTC | #2 
On Thu, Jul 27, 2023 at 12:40:10PM +0800, Tim Jiang wrote:
> This patch make the print btsoc type expression more clearly.
> 
> Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com>
> ---
>  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;

I still think the above should be sorted (alphabetically) as maintaining
these lists otherwise soon becomes harder than it should be. And similar
throughout the driver.

> +	default:
> +		soc_name = "unknown soc";
> +		break;
> +	}
> +	bt_dev_info(hdev, "setting up %s", soc_name);

Johan
Tim Jiang July 27, 2023, 7:34 a.m. UTC | #3 
On 7/27/23 15:27, Johan Hovold wrote:
> On Thu, Jul 27, 2023 at 12:40:10PM +0800, Tim Jiang wrote:
>> This patch make the print btsoc type expression more clearly.
>>
>> Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com>
>> ---
>>   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;
> I still think the above should be sorted (alphabetically) as maintaining
> these lists otherwise soon becomes harder than it should be. And similar
> throughout the driver.
[Tim] Hi Johan: I think we no need to sort it, we only add the new btsoc 
name following the older one, for example , ar300x is the oldest , ROME 
is new than ar300x, actually qca2066 is newer version chip than qca6390, 
so I does not think we need to sort it.
>
>> +	default:
>> +		soc_name = "unknown soc";
>> +		break;
>> +	}
>> +	bt_dev_info(hdev, "setting up %s", soc_name);
> Johan
Johan Hovold July 27, 2023, 7:50 a.m. UTC | #4 
On Thu, Jul 27, 2023 at 03:34:53PM +0800, Tim Jiang wrote:
> On 7/27/23 15:27, Johan Hovold wrote:
> > On Thu, Jul 27, 2023 at 12:40:10PM +0800, Tim Jiang wrote:

> >> @@ -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;
> > I still think the above should be sorted (alphabetically) as maintaining
> > these lists otherwise soon becomes harder than it should be. And similar
> > throughout the driver.

> [Tim] Hi Johan: I think we no need to sort it, we only add the new btsoc 
> name following the older one, for example , ar300x is the oldest , ROME 
> is new than ar300x, actually qca2066 is newer version chip than qca6390, 
> so I does not think we need to sort it.

Possibly, but generally this becomes hard to maintain and eventually
someone will need to sort these entries anyway. Therefore it's generally
a good idea to just do so from the start.

But it was good that you replied so that we know that this comment was
not just missed or ignored.

> >> +	default:
> >> +		soc_name = "unknown soc";
> >> +		break;
> >> +	}
> >> +	bt_dev_info(hdev, "setting up %s", soc_name);

Johan
diff mbox series

Patch

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;