Commit 1cc41b50 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: qca: simplify WCN399x NVM loading 



The WCN399x code has two separate cases for loading the NVM data. In
preparation to adding support for WCN3950, which also requires similar
quirk, split the "variant" to be specified explicitly and merge two
snprintfs into a single one.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent d0b391ef

drivers/bluetooth/btqca.c

+6 −7
Original line number Diff line number Diff line
@@ -785,6 +785,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		   const char *firmware_name, const char *rampatch_name)

{

	struct qca_fw_config config = {};

	const char *variant = "";

	int err;

	u8 rom_ver = 0;

	u32 soc_ver;
@@ -883,13 +884,11 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		case QCA_WCN3990:

		case QCA_WCN3991:

		case QCA_WCN3998:

			if (le32_to_cpu(ver.soc_id) == QCA_WCN3991_SOC_ID) {

				snprintf(config.fwname, sizeof(config.fwname),

					 "qca/crnv%02xu.bin", rom_ver);

			} else {

			if (le32_to_cpu(ver.soc_id) == QCA_WCN3991_SOC_ID)

				variant = "u";



			snprintf(config.fwname, sizeof(config.fwname),

					 "qca/crnv%02x.bin", rom_ver);

			}

				 "qca/crnv%02x%s.bin", rom_ver, variant);

			break;

		case QCA_WCN3988:

			snprintf(config.fwname, sizeof(config.fwname),