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@xxxxxxxxxxx> > --- > 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