Bluetooth: btmtk: apply the common btmtk_fw_get_filename

Apply the common btmtk_fw_get_filename to avoid the similar coding in each
driver.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index 8ded9ef8089a2fdbb697b253e70aee7a95e36392..b4e560a17aa68c95cff814c0b0e6f2c376c08441 100644 (file)
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -1117,6 +1117,9 @@ static int btmtksdio_setup(struct hci_dev *hdev)
                        return err;
                }
 
+               btmtk_fw_get_filename(fwname, sizeof(fwname), dev_id,
+                                     fw_version, 0);
+
                snprintf(fwname, sizeof(fwname),
                         "mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin",
                         dev_id & 0xffff, (fw_version & 0xff) + 1);

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index e384ef6ff050d945a014fa4651a44caf84653672..611135d1ce01a073e521e3ebfc065f90e7d50a7e 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3166,18 +3166,8 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
        case 0x7922:
        case 0x7961:
        case 0x7925:
-               if (dev_id == 0x7925)
-                       snprintf(fw_bin_name, sizeof(fw_bin_name),
-                                "mediatek/mt%04x/BT_RAM_CODE_MT%04x_1_%x_hdr.bin",
-                                dev_id & 0xffff, dev_id & 0xffff, (fw_version & 0xff) + 1);
-               else if (dev_id == 0x7961 && fw_flavor)
-                       snprintf(fw_bin_name, sizeof(fw_bin_name),
-                                "mediatek/BT_RAM_CODE_MT%04x_1a_%x_hdr.bin",
-                                dev_id & 0xffff, (fw_version & 0xff) + 1);
-               else
-                       snprintf(fw_bin_name, sizeof(fw_bin_name),
-                                "mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin",
-                                dev_id & 0xffff, (fw_version & 0xff) + 1);
+               btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id,
+                                     fw_version, fw_flavor);
 
                err = btmtk_setup_firmware_79xx(hdev, fw_bin_name,
                                                btusb_mtk_hci_wmt_sync);