On Tue, Mar 11, 2025 at 12:43 PM Thorsten Blum <thorsten.blum@xxxxxxxxx> wrote:
>
> Remove hard-coded strings by using the str_enabled_disabled() helper
> function.
>
> Acked-by: Bruno Faccini <bfaccini@xxxxxxxxxx>
> Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxx>
> ---
> drivers/acpi/numa/srat.c | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c
> index 00ac0d7bb8c9..ac7045f3b85b 100644
> --- a/drivers/acpi/numa/srat.c
> +++ b/drivers/acpi/numa/srat.c
> @@ -18,6 +18,7 @@
> #include <linux/nodemask.h>
> #include <linux/topology.h>
> #include <linux/numa_memblks.h>
> +#include <linux/string_choices.h>
>
> static nodemask_t nodes_found_map = NODE_MASK_NONE;
>
> @@ -187,8 +188,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
> pr_debug("SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n",
> p->apic_id, p->local_sapic_eid,
> p->proximity_domain_lo,
> - (p->flags & ACPI_SRAT_CPU_ENABLED) ?
> - "enabled" : "disabled");
> + str_enabled_disabled(p->flags & ACPI_SRAT_CPU_ENABLED));
> }
> break;
>
> @@ -200,8 +200,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
> (unsigned long long)p->base_address,
> (unsigned long long)p->length,
> p->proximity_domain,
> - (p->flags & ACPI_SRAT_MEM_ENABLED) ?
> - "enabled" : "disabled",
> + str_enabled_disabled(p->flags & ACPI_SRAT_MEM_ENABLED),
> (p->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ?
> " hot-pluggable" : "",
> (p->flags & ACPI_SRAT_MEM_NON_VOLATILE) ?
> @@ -216,8 +215,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
> pr_debug("SRAT Processor (x2apicid[0x%08x]) in proximity domain %d %s\n",
> p->apic_id,
> p->proximity_domain,
> - (p->flags & ACPI_SRAT_CPU_ENABLED) ?
> - "enabled" : "disabled");
> + str_enabled_disabled(p->flags & ACPI_SRAT_CPU_ENABLED));
> }
> break;
>
> @@ -228,8 +226,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
> pr_debug("SRAT Processor (acpi id[0x%04x]) in proximity domain %d %s\n",
> p->acpi_processor_uid,
> p->proximity_domain,
> - (p->flags & ACPI_SRAT_GICC_ENABLED) ?
> - "enabled" : "disabled");
> + str_enabled_disabled(p->flags & ACPI_SRAT_GICC_ENABLED));
> }
> break;
>
> @@ -247,8 +244,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
> *(u16 *)(&p->device_handle[0]),
> *(u16 *)(&p->device_handle[2]),
> p->proximity_domain,
> - (p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED) ?
> - "enabled" : "disabled");
> + str_enabled_disabled(p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED));
> } else {
> /*
> * In this case we can rely on the device having a
> @@ -258,8 +254,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
> (char *)(&p->device_handle[0]),
> (char *)(&p->device_handle[8]),
> p->proximity_domain,
> - (p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED) ?
> - "enabled" : "disabled");
> + str_enabled_disabled(p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED));
> }
> }
> break;
> @@ -271,8 +266,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
> pr_debug("SRAT Processor (acpi id[0x%04x]) in proximity domain %d %s\n",
> p->acpi_processor_uid,
> p->proximity_domain,
> - (p->flags & ACPI_SRAT_RINTC_ENABLED) ?
> - "enabled" : "disabled");
> + str_enabled_disabled(p->flags & ACPI_SRAT_RINTC_ENABLED));
> }
> break;
>
> --
Applied as 6.15-rc material, thanks!
