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

Bluetooth: btusb: Move Intel command structs into its own header

Since the Intel Bluetooth support has its own header, it makes sense
to move all command structs into it.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

+33 -33
+33
drivers/bluetooth/btintel.h
··· 21 21 * 22 22 */ 23 23 24 + struct intel_version { 25 + u8 status; 26 + u8 hw_platform; 27 + u8 hw_variant; 28 + u8 hw_revision; 29 + u8 fw_variant; 30 + u8 fw_revision; 31 + u8 fw_build_num; 32 + u8 fw_build_ww; 33 + u8 fw_build_yy; 34 + u8 fw_patch_num; 35 + } __packed; 36 + 37 + struct intel_boot_params { 38 + __u8 status; 39 + __u8 otp_format; 40 + __u8 otp_content; 41 + __u8 otp_patch; 42 + __le16 dev_revid; 43 + __u8 secure_boot; 44 + __u8 key_from_hdr; 45 + __u8 key_type; 46 + __u8 otp_lock; 47 + __u8 api_lock; 48 + __u8 debug_lock; 49 + bdaddr_t otp_bdaddr; 50 + __u8 min_fw_build_nn; 51 + __u8 min_fw_build_cw; 52 + __u8 min_fw_build_yy; 53 + __u8 limited_cce; 54 + __u8 unlocked_state; 55 + } __packed; 56 + 24 57 #if IS_ENABLED(CONFIG_BT_INTEL) 25 58 26 59 int btintel_check_bdaddr(struct hci_dev *hdev);
-33
drivers/bluetooth/btusb.c
··· 1345 1345 return ret; 1346 1346 } 1347 1347 1348 - struct intel_version { 1349 - u8 status; 1350 - u8 hw_platform; 1351 - u8 hw_variant; 1352 - u8 hw_revision; 1353 - u8 fw_variant; 1354 - u8 fw_revision; 1355 - u8 fw_build_num; 1356 - u8 fw_build_ww; 1357 - u8 fw_build_yy; 1358 - u8 fw_patch_num; 1359 - } __packed; 1360 - 1361 - struct intel_boot_params { 1362 - __u8 status; 1363 - __u8 otp_format; 1364 - __u8 otp_content; 1365 - __u8 otp_patch; 1366 - __le16 dev_revid; 1367 - __u8 secure_boot; 1368 - __u8 key_from_hdr; 1369 - __u8 key_type; 1370 - __u8 otp_lock; 1371 - __u8 api_lock; 1372 - __u8 debug_lock; 1373 - bdaddr_t otp_bdaddr; 1374 - __u8 min_fw_build_nn; 1375 - __u8 min_fw_build_cw; 1376 - __u8 min_fw_build_yy; 1377 - __u8 limited_cce; 1378 - __u8 unlocked_state; 1379 - } __packed; 1380 - 1381 1348 static const struct firmware *btusb_setup_intel_get_fw(struct hci_dev *hdev, 1382 1349 struct intel_version *ver) 1383 1350 {