Bluetooth: btusb: Fix new sparce warnings
Luiz Augusto von Dentz
maintainerPATCH v2 1/3 Bluetooth: btusb: Fix new sparce warnings
From: Luiz Augusto von Dentz <[email protected]>
This fix the following warnings detect with make W=1 C=1:
drivers/bluetooth/btusb.c:2212:9: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2212:9: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2245:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2249:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2253:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2257:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2261:18: warning: cast to restricted __le16 drivers/bluetooth/btusb.c:2267:18: warning: cast to restricted __le16
--- drivers/bluetooth/btusb.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/bluetooth/btusb.c +13 -12
@@ -2201,18 +2201,19 @@ static int btusb_setup_csr(struct hci_dev *hdev)return err; } -if (skb->len !=sizeof (struct hci_rp_read_local_version )) { + rp =skb_pull_data (skb,sizeof (*rp)); +if (!rp) {bt_dev_err (hdev,"CSR: Local version length mismatch" );kfree_skb (skb);return -EIO ; } - rp = (struct hci_rp_read_local_version *)skb->data; +bt_dev_info (hdev,"CSR: Setting up dongle with HCI ver=%u rev=%04x" , + rp->hci_ver,le16_to_cpu (rp->hci_rev)); -bt_dev_info (hdev,"CSR: Setting up dongle with HCI ver=%u rev=%04x; LMP ver=%u subver=%04x; manufacturer=%u" , -le16_to_cpu (rp->hci_ver),le16_to_cpu (rp->hci_rev), -le16_to_cpu (rp->lmp_ver),le16_to_cpu (rp->lmp_subver), -le16_to_cpu (rp->manufacturer)); +bt_dev_info (hdev,"LMP ver=%u subver=%04x; manufacturer=%u" , + rp->lmp_ver,le16_to_cpu (rp->lmp_subver), +le16_to_cpu (rp->manufacturer));/* Detect a wide host of Chinese controllers that aren't CSR. *
@@ -2242,29 +2243,29 @@ static int btusb_setup_csr(struct hci_dev *hdev)* third-party BT 4.0 dongle reuses it. */ else if (le16_to_cpu(rp->lmp_subver) <= 0x034e && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_1_1) + rp->hci_ver > BLUETOOTH_VER_1_1) is_fake = true; else if (le16_to_cpu(rp->lmp_subver) <= 0x0529 && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_1_2) + rp->hci_ver > BLUETOOTH_VER_1_2) is_fake = true; else if (le16_to_cpu(rp->lmp_subver) <= 0x0c5c && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_2_0) + rp->hci_ver > BLUETOOTH_VER_2_0) is_fake = true; else if (le16_to_cpu(rp->lmp_subver) <= 0x1899 && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_2_1) + rp->hci_ver > BLUETOOTH_VER_2_1) is_fake = true; else if (le16_to_cpu(rp->lmp_subver) <= 0x22bb && - le16_to_cpu(rp->hci_ver) > BLUETOOTH_VER_4_0) + rp->hci_ver > BLUETOOTH_VER_4_0) is_fake = true;/* Other clones which beat all the above checks */ else if (bcdDevice == 0x0134 && le16_to_cpu(rp->lmp_subver) == 0x0c5c && - le16_to_cpu(rp->hci_ver) == BLUETOOTH_VER_2_0) + rp->hci_ver == BLUETOOTH_VER_2_0) is_fake = true;if (is_fake) {
Signature · 1 line
2.37.3
Luiz Augusto von Dentz
maintainerPATCH v2 2/3 Bluetooth: btusb: Fix existing sparce warning
From: Luiz Augusto von Dentz <[email protected]>
This fix the following warnings detect with make W=1 C=1:
drivers/bluetooth/btusb.c:3426:28: warning: cast to restricted __le32
--- drivers/bluetooth/btusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/btusb.c +1 -1
@@ -3423,7 +3423,7 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev,if (ver_rom & ~0xffffU ) { rver_rom_high =le16_to_cpu (rver->rom_version_high); - rver_rom =le32_to_cpu (rver_rom_high <<16 | rver_rom_low); + rver_rom = rver_rom_high <<16 | rver_rom_low; }else { rver_rom = rver_rom_low; }
Signature · 1 line
2.37.3
Luiz Augusto von Dentz
maintainerPATCH v2 3/3 Bluetooth: btintel: Fix existing sparce warnings
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This fix the following warnings detect with make W=1 C=1:
drivers/bluetooth/btintel.c:1041:38: warning: cast to restricted __le32 drivers/bluetooth/btintel.c:1786:25: warning: cast to restricted __le16 drivers/bluetooth/btintel.c:1795:25: warning: cast to restricted __le16 drivers/bluetooth/btintel.c:1796:25: warning: cast to restricted __le16 drivers/bluetooth/btintel.c:1797:25: warning: cast to restricted __le16
--- drivers/bluetooth/btintel.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/bluetooth/btintel.c +8 -8
@@ -26,7 +26,7 @@#define CMD_WRITE_BOOT_PARAMS 0xfc0estruct cmd_write_boot_params { -u32 boot_addr; +__le32 boot_addr;u8 fw_build_num;u8 fw_build_ww;u8 fw_build_yy;
@@ -1783,19 +1783,19 @@ static int btintel_get_fw_name(struct intel_version *ver,case 0x0b :/* SfP */ case 0x0c :/* WsP */ snprintf (fw_name, len,"intel/ibt-%u-%u.%s" , -le16_to_cpu (ver->hw_variant), -le16_to_cpu (params->dev_revid), - suffix); + ver->hw_variant, +le16_to_cpu (params->dev_revid), + suffix);break ;case 0x11 :/* JfP */ case 0x12 :/* ThP */ case 0x13 :/* HrP */ case 0x14 :/* CcP */ snprintf (fw_name, len,"intel/ibt-%u-%u-%u.%s" , -le16_to_cpu (ver->hw_variant), -le16_to_cpu (ver->hw_revision), -le16_to_cpu (ver->fw_revision), - suffix); + ver->hw_variant, + ver->hw_revision, + ver->fw_revision, + suffix);break ;default :return -EINVAL ;
Signature · 1 line
2.37.3
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=701910
---Test result---
Test Summary:
CheckPatch PASS 1.72 seconds GitLint PASS 0.85 seconds SubjectPrefix PASS 0.29 seconds BuildKernel PASS 34.88 seconds BuildKernel32 PASS 30.81 seconds TestRunnerSetup PASS 428.62 seconds TestRunner_l2cap-tester PASS 15.67 seconds TestRunner_iso-tester PASS 15.59 seconds TestRunner_bnep-tester PASS 5.42 seconds TestRunner_mgmt-tester PASS 104.21 seconds TestRunner_rfcomm-tester PASS 9.23 seconds TestRunner_sco-tester PASS 8.66 seconds TestRunner_ioctl-tester PASS 9.82 seconds TestRunner_mesh-tester PASS 6.64 seconds TestRunner_smp-tester PASS 8.36 seconds TestRunner_userchan-tester PASS 5.55 seconds IncrementalBuild PASS 42.68 seconds
---
Regards,
Linux Bluetooth
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 13 lines · On Mon, 5 Dec 2022 10:32:34 -0800 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
This fix the following warnings detect with make W=1 C=1:
drivers/bluetooth/btusb.c:2212:9: warning: cast to restricted__le16drivers/bluetooth/btusb.c:2212:9: warning: cast to restricted__le16drivers/bluetooth/btusb.c:2245:18: warning: cast to restricted__le16drivers/bluetooth/btusb.c:2249:18: warning: cast to restricted__le16drivers/bluetooth/btusb.c:2253:18: warning: cast to restricted__le16drivers/bluetooth/btusb.c:2257:18: warning: cast to restricted__le16drivers/bluetooth/btusb.c:2261:18: warning: cast to restricted__le16drivers/bluetooth/btusb.c:2267:18: warning: cast to restricted__le16
Quoted 1 line
[...]
Here is the summary with links:
- [v2,1/3] Bluetooth: btusb: Fix new sparce warnings
https://git.kernel.org/bluetooth/bluetooth-next/c/ee93fd98d900 - [v2,2/3] Bluetooth: btusb: Fix existing sparce warning https://git.kernel.org/bluetooth/bluetooth-next/c/e05ae902672a
- [v2,3/3] Bluetooth: btintel: Fix existing sparce warnings
https://git.kernel.org/bluetooth/bluetooth-next/c/b84a13ff4eda
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html