|
9 | 9 | #include <linux/module.h>
|
10 | 10 | #include <linux/firmware.h>
|
11 | 11 | #include <linux/regmap.h>
|
| 12 | +#include <linux/string_choices.h> |
12 | 13 | #include <linux/acpi.h>
|
13 | 14 | #include <acpi/acpi_bus.h>
|
14 | 15 | #include <linux/unaligned.h>
|
@@ -506,13 +507,13 @@ int btintel_version_info_tlv(struct hci_dev *hdev,
|
506 | 507 |
|
507 | 508 | bt_dev_info(hdev, "Device revision is %u", version->dev_rev_id);
|
508 | 509 | bt_dev_info(hdev, "Secure boot is %s",
|
509 |
| - version->secure_boot ? "enabled" : "disabled"); |
| 510 | + str_enabled_disabled(version->secure_boot)); |
510 | 511 | bt_dev_info(hdev, "OTP lock is %s",
|
511 |
| - version->otp_lock ? "enabled" : "disabled"); |
| 512 | + str_enabled_disabled(version->otp_lock)); |
512 | 513 | bt_dev_info(hdev, "API lock is %s",
|
513 |
| - version->api_lock ? "enabled" : "disabled"); |
| 514 | + str_enabled_disabled(version->api_lock)); |
514 | 515 | bt_dev_info(hdev, "Debug lock is %s",
|
515 |
| - version->debug_lock ? "enabled" : "disabled"); |
| 516 | + str_enabled_disabled(version->debug_lock)); |
516 | 517 | bt_dev_info(hdev, "Minimum firmware build %u week %u %u",
|
517 | 518 | version->min_fw_build_nn, version->min_fw_build_cw,
|
518 | 519 | 2000 + version->min_fw_build_yy);
|
@@ -927,16 +928,16 @@ int btintel_read_boot_params(struct hci_dev *hdev,
|
927 | 928 | le16_to_cpu(params->dev_revid));
|
928 | 929 |
|
929 | 930 | bt_dev_info(hdev, "Secure boot is %s",
|
930 |
| - params->secure_boot ? "enabled" : "disabled"); |
| 931 | + str_enabled_disabled(params->secure_boot)); |
931 | 932 |
|
932 | 933 | bt_dev_info(hdev, "OTP lock is %s",
|
933 |
| - params->otp_lock ? "enabled" : "disabled"); |
| 934 | + str_enabled_disabled(params->otp_lock)); |
934 | 935 |
|
935 | 936 | bt_dev_info(hdev, "API lock is %s",
|
936 |
| - params->api_lock ? "enabled" : "disabled"); |
| 937 | + str_enabled_disabled(params->api_lock)); |
937 | 938 |
|
938 | 939 | bt_dev_info(hdev, "Debug lock is %s",
|
939 |
| - params->debug_lock ? "enabled" : "disabled"); |
| 940 | + str_enabled_disabled(params->debug_lock)); |
940 | 941 |
|
941 | 942 | bt_dev_info(hdev, "Minimum firmware build %u week %u %u",
|
942 | 943 | params->min_fw_build_nn, params->min_fw_build_cw,
|
|
0 commit comments