tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Sean Wang and committed by
Luiz Augusto von Dentz 7f935b21 00f993fd

+5 -12
+3
drivers/bluetooth/btmtksdio.c
··· 1117 1117 return err; 1118 1118 } 1119 1119 1120 + btmtk_fw_get_filename(fwname, sizeof(fwname), dev_id, 1121 + fw_version, 0); 1122 + 1120 1123 snprintf(fwname, sizeof(fwname), 1121 1124 "mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin", 1122 1125 dev_id & 0xffff, (fw_version & 0xff) + 1);
+2 -12
drivers/bluetooth/btusb.c
··· 3166 3166 case 0x7922: 3167 3167 case 0x7961: 3168 3168 case 0x7925: 3169 - if (dev_id == 0x7925) 3170 - snprintf(fw_bin_name, sizeof(fw_bin_name), 3171 - "mediatek/mt%04x/BT_RAM_CODE_MT%04x_1_%x_hdr.bin", 3172 - dev_id & 0xffff, dev_id & 0xffff, (fw_version & 0xff) + 1); 3173 - else if (dev_id == 0x7961 && fw_flavor) 3174 - snprintf(fw_bin_name, sizeof(fw_bin_name), 3175 - "mediatek/BT_RAM_CODE_MT%04x_1a_%x_hdr.bin", 3176 - dev_id & 0xffff, (fw_version & 0xff) + 1); 3177 - else 3178 - snprintf(fw_bin_name, sizeof(fw_bin_name), 3179 - "mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin", 3180 - dev_id & 0xffff, (fw_version & 0xff) + 1); 3169 + btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id, 3170 + fw_version, fw_flavor); 3181 3171 3182 3172 err = btmtk_setup_firmware_79xx(hdev, fw_bin_name, 3183 3173 btusb_mtk_hci_wmt_sync);