]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ACPI: NUMA: Use str_enabled_disabled() helper function
authorThorsten Blum <thorsten.blum@linux.dev>
Tue, 11 Mar 2025 11:42:57 +0000 (12:42 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 27 Mar 2025 12:26:04 +0000 (13:26 +0100)
Remove hard-coded strings by using the str_enabled_disabled() helper
function.

Acked-by: Bruno Faccini <bfaccini@nvidia.com>
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/numa/srat.c

index ce815d7cb8f659b18a3a100a05d40cfe46d41308..0a725e46d017b9606d07d9d55395208cbb306953 100644 (file)
@@ -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;
 
@@ -188,8 +189,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;
 
@@ -201,8 +201,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) ?
@@ -217,8 +216,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;
 
@@ -229,8 +227,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;
 
@@ -248,8 +245,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
@@ -259,8 +255,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;
@@ -272,8 +267,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;