Bluetooth: btrtl: Fix incorrect bin loading by MODULE_FIRMWARE

In brctl, there are some problems which are as follows:
1. The bin name of MODULE_FIRMWARE is incorrect or the bin does not
exist.
2. The bin used in ic_id_table have not added MODULE_FIRMWARE
declarations.
3. Sorting confusion.

Thus, modify incorrect bin names and delete some non-existing bin
names, add MODULE_FIRMWARE for bins that used in ic_id_table and
sort by MODULE_FIRMWARE(ctl_bt/*.bin).

Signed-off-by: Meng Tang <tangmeng@uniontech.com>
---
 drivers/bluetooth/btrtl.c | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=618615

---Test result---

Test Summary:
CheckPatch                    PASS      1.69 seconds
GitLint                       PASS      0.95 seconds
SubjectPrefix                 PASS      0.86 seconds
BuildKernel                   PASS      37.50 seconds
BuildKernel32                 PASS      32.84 seconds
Incremental Build with patchesPASS      42.39 seconds
TestRunner: Setup             PASS      599.68 seconds
TestRunner: l2cap-tester      PASS      16.90 seconds
TestRunner: bnep-tester       PASS      7.67 seconds
TestRunner: mgmt-tester       PASS      126.78 seconds
TestRunner: rfcomm-tester     PASS      10.31 seconds
TestRunner: sco-tester        PASS      10.02 seconds
TestRunner: smp-tester        PASS      9.53 seconds
TestRunner: userchan-tester   PASS      7.95 seconds



---
Regards,
Linux Bluetooth

Hi Meng,

> In brctl, there are some problems which are as follows:
> 1. The bin name of MODULE_FIRMWARE is incorrect or the bin does not
> exist.
> 2. The bin used in ic_id_table have not added MODULE_FIRMWARE
> declarations.
> 3. Sorting confusion.
> 
> Thus, modify incorrect bin names and delete some non-existing bin
> names, add MODULE_FIRMWARE for bins that used in ic_id_table and
> sort by MODULE_FIRMWARE(ctl_bt/*.bin).
> 
> Signed-off-by: Meng Tang <tangmeng@uniontech.com>
> ---
> drivers/bluetooth/btrtl.c | 37 +++++++++++++++++++------------------
> 1 file changed, 19 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
> index c2030f7e25b4..e34b0a29f230 100644
> --- a/drivers/bluetooth/btrtl.c
> +++ b/drivers/bluetooth/btrtl.c
> @@ -88,14 +88,14 @@ static const struct id_table ic_id_table[] = {
> 	  .config_needed = true,
> 	  .has_rom_version = true,
> 	  .fw_name  = "rtl_bt/rtl8723bs_fw.bin",
> -	  .cfg_name = "rtl_bt/rtl8723bs_config" },
> +	  .cfg_name = "rtl_bt/rtl8723bs_config-OBDA8723" },
> 
> 	/* 8723B */
> 	{ IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_USB),
> 	  .config_needed = false,
> 	  .has_rom_version = true,
> 	  .fw_name  = "rtl_bt/rtl8723b_fw.bin",
> -	  .cfg_name = "rtl_bt/rtl8723b_config" },
> +	  .cfg_name = NULL },
> 
> 	/* 8723D */
> 	{ IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_USB),
> @@ -104,19 +104,12 @@ static const struct id_table ic_id_table[] = {
> 	  .fw_name  = "rtl_bt/rtl8723d_fw.bin",
> 	  .cfg_name = "rtl_bt/rtl8723d_config" },
> 
> -	/* 8723DS */
> -	{ IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_UART),
> -	  .config_needed = true,
> -	  .has_rom_version = true,
> -	  .fw_name  = "rtl_bt/rtl8723ds_fw.bin",
> -	  .cfg_name = "rtl_bt/rtl8723ds_config" },
> -
> 	/* 8821A */
> 	{ IC_INFO(RTL_ROM_LMP_8821A, 0xa, 0x6, HCI_USB),
> 	  .config_needed = false,
> 	  .has_rom_version = true,
> 	  .fw_name  = "rtl_bt/rtl8821a_fw.bin",
> -	  .cfg_name = "rtl_bt/rtl8821a_config" },
> +	  .cfg_name = NULL },
> 
> 	/* 8821C */
> 	{ IC_INFO(RTL_ROM_LMP_8821A, 0xc, 0x8, HCI_USB),
> @@ -131,7 +124,7 @@ static const struct id_table ic_id_table[] = {
> 	  .config_needed = false,
> 	  .has_rom_version = true,
> 	  .fw_name  = "rtl_bt/rtl8761a_fw.bin",
> -	  .cfg_name = "rtl_bt/rtl8761a_config" },
> +	  .cfg_name = NULL },
> 
> 	/* 8761B */
> 	{ IC_INFO(RTL_ROM_LMP_8761A, 0xb, 0xa, HCI_UART),
> @@ -922,15 +915,23 @@ MODULE_LICENSE("GPL");
> MODULE_FIRMWARE("rtl_bt/rtl8723a_fw.bin");
> MODULE_FIRMWARE("rtl_bt/rtl8723b_fw.bin");
> MODULE_FIRMWARE("rtl_bt/rtl8723b_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8723bs_config-OBDA8723.bin");
> MODULE_FIRMWARE("rtl_bt/rtl8723bs_fw.bin");
> -MODULE_FIRMWARE("rtl_bt/rtl8723bs_config.bin");
> -MODULE_FIRMWARE("rtl_bt/rtl8723ds_fw.bin");
> -MODULE_FIRMWARE("rtl_bt/rtl8723ds_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8723d_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8723d_fw.bin");
> MODULE_FIRMWARE("rtl_bt/rtl8761a_fw.bin");
> -MODULE_FIRMWARE("rtl_bt/rtl8761a_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8761b_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8761b_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8761bu_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8761bu_fw.bin");
> MODULE_FIRMWARE("rtl_bt/rtl8821a_fw.bin");
> -MODULE_FIRMWARE("rtl_bt/rtl8821a_config.bin");
> -MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8821c_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8821c_fw.bin");
> MODULE_FIRMWARE("rtl_bt/rtl8822b_config.bin");
> -MODULE_FIRMWARE("rtl_bt/rtl8852au_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8822cs_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8822cs_fw.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8822cu_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8822cu_fw.bin");
> MODULE_FIRMWARE("rtl_bt/rtl8852au_config.bin");
> +MODULE_FIRMWARE("rtl_bt/rtl8852au_fw.bin");

simply put no. I have no idea what you are doing. The commit message description is indecipherable to me. This looks like 4 independent things mashed together.

Regards

Marcel