Commit 7f935b21 authored by Sean Wang's avatar Sean Wang Committed by Luiz Augusto von Dentz

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: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 00f993fd
...@@ -1117,6 +1117,9 @@ static int btmtksdio_setup(struct hci_dev *hdev) ...@@ -1117,6 +1117,9 @@ static int btmtksdio_setup(struct hci_dev *hdev)
return err; return err;
} }
btmtk_fw_get_filename(fwname, sizeof(fwname), dev_id,
fw_version, 0);
snprintf(fwname, sizeof(fwname), snprintf(fwname, sizeof(fwname),
"mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin", "mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin",
dev_id & 0xffff, (fw_version & 0xff) + 1); dev_id & 0xffff, (fw_version & 0xff) + 1);
......
...@@ -3166,18 +3166,8 @@ static int btusb_mtk_setup(struct hci_dev *hdev) ...@@ -3166,18 +3166,8 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
case 0x7922: case 0x7922:
case 0x7961: case 0x7961:
case 0x7925: case 0x7925:
if (dev_id == 0x7925) btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id,
snprintf(fw_bin_name, sizeof(fw_bin_name), fw_version, fw_flavor);
"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);
err = btmtk_setup_firmware_79xx(hdev, fw_bin_name, err = btmtk_setup_firmware_79xx(hdev, fw_bin_name,
btusb_mtk_hci_wmt_sync); btusb_mtk_hci_wmt_sync);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment