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: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index cdf09d9a9ad27c080f27c5fe8d61d76085e1fd2c..7d6b02fe2040ff16d9d62de683571e1e1900fe85 100644 (file)
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -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 {
-                               snprintf(config.fwname, sizeof(config.fwname),
-                                        "qca/crnv%02x.bin", rom_ver);
-                       }
+                       if (le32_to_cpu(ver.soc_id) == QCA_WCN3991_SOC_ID)
+                               variant = "u";
+
+                       snprintf(config.fwname, sizeof(config.fwname),
+                                "qca/crnv%02x%s.bin", rom_ver, variant);
                        break;
                case QCA_WCN3988:
                        snprintf(config.fwname, sizeof(config.fwname),