Skip to content

Commit 359595b

Browse files
tobluxrafaeljw
authored andcommitted
ACPI: NUMA: Use str_enabled_disabled() helper function
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>
1 parent 21e0ff5 commit 359595b

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

drivers/acpi/numa/srat.c

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <linux/nodemask.h>
1919
#include <linux/topology.h>
2020
#include <linux/numa_memblks.h>
21+
#include <linux/string_choices.h>
2122

2223
static nodemask_t nodes_found_map = NODE_MASK_NONE;
2324

@@ -188,8 +189,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
188189
pr_debug("SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n",
189190
p->apic_id, p->local_sapic_eid,
190191
p->proximity_domain_lo,
191-
(p->flags & ACPI_SRAT_CPU_ENABLED) ?
192-
"enabled" : "disabled");
192+
str_enabled_disabled(p->flags & ACPI_SRAT_CPU_ENABLED));
193193
}
194194
break;
195195

@@ -201,8 +201,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
201201
(unsigned long long)p->base_address,
202202
(unsigned long long)p->length,
203203
p->proximity_domain,
204-
(p->flags & ACPI_SRAT_MEM_ENABLED) ?
205-
"enabled" : "disabled",
204+
str_enabled_disabled(p->flags & ACPI_SRAT_MEM_ENABLED),
206205
(p->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ?
207206
" hot-pluggable" : "",
208207
(p->flags & ACPI_SRAT_MEM_NON_VOLATILE) ?
@@ -217,8 +216,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
217216
pr_debug("SRAT Processor (x2apicid[0x%08x]) in proximity domain %d %s\n",
218217
p->apic_id,
219218
p->proximity_domain,
220-
(p->flags & ACPI_SRAT_CPU_ENABLED) ?
221-
"enabled" : "disabled");
219+
str_enabled_disabled(p->flags & ACPI_SRAT_CPU_ENABLED));
222220
}
223221
break;
224222

@@ -229,8 +227,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
229227
pr_debug("SRAT Processor (acpi id[0x%04x]) in proximity domain %d %s\n",
230228
p->acpi_processor_uid,
231229
p->proximity_domain,
232-
(p->flags & ACPI_SRAT_GICC_ENABLED) ?
233-
"enabled" : "disabled");
230+
str_enabled_disabled(p->flags & ACPI_SRAT_GICC_ENABLED));
234231
}
235232
break;
236233

@@ -248,8 +245,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
248245
*(u16 *)(&p->device_handle[0]),
249246
*(u16 *)(&p->device_handle[2]),
250247
p->proximity_domain,
251-
(p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED) ?
252-
"enabled" : "disabled");
248+
str_enabled_disabled(p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED));
253249
} else {
254250
/*
255251
* 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)
259255
(char *)(&p->device_handle[0]),
260256
(char *)(&p->device_handle[8]),
261257
p->proximity_domain,
262-
(p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED) ?
263-
"enabled" : "disabled");
258+
str_enabled_disabled(p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED));
264259
}
265260
}
266261
break;
@@ -272,8 +267,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
272267
pr_debug("SRAT Processor (acpi id[0x%04x]) in proximity domain %d %s\n",
273268
p->acpi_processor_uid,
274269
p->proximity_domain,
275-
(p->flags & ACPI_SRAT_RINTC_ENABLED) ?
276-
"enabled" : "disabled");
270+
str_enabled_disabled(p->flags & ACPI_SRAT_RINTC_ENABLED));
277271
}
278272
break;
279273

0 commit comments

Comments
 (0)