]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ACPI: Use str_low_high() helper in two places
authorChelsy Ratnawat <chelsyratnawat2001@gmail.com>
Sat, 23 Aug 2025 22:03:11 +0000 (15:03 -0700)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 25 Aug 2025 18:25:53 +0000 (20:25 +0200)
Replace hard-coded string choices with the str_low_high() helper
in two places in the ACPI code.

Signed-off-by: Chelsy Ratnawat <chelsyratnawat2001@gmail.com>
Link: https://patch.msgid.link/20250823220311.2035533-1-chelsyratnawat2001@gmail.com
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/pci_irq.c
drivers/acpi/resource.c

index 630fe0a34bc6e738e1001d6958498babb7337f3d..ad81aa03fe2f8534cf76bc323e6b2dd9b0a54883 100644 (file)
@@ -22,6 +22,7 @@
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/string_choices.h>
 
 struct acpi_prt_entry {
        struct acpi_pci_id      id;
@@ -468,7 +469,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
        dev_dbg(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n",
                pin_name(pin), link_desc, gsi,
                (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
-               (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
+               str_low_high(polarity == ACPI_ACTIVE_LOW), dev->irq);
 
        kfree(entry);
        return 0;
index b1ab192d7a0809fe967e7a6d1318c5a3e04848ac..55b195ad5c7e5e598f6edea4ea912a940f97b3e4 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/irq.h>
 #include <linux/dmi.h>
+#include <linux/string_choices.h>
 
 #ifdef CONFIG_X86
 #define valid_IRQ(i) (((i) != 0) && ((i) != 2))
@@ -773,7 +774,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
                        pr_warn("ACPI: IRQ %d override to %s%s, %s%s\n", gsi,
                                t ? "level" : "edge",
                                trig == triggering ? "" : "(!)",
-                               p ? "low" : "high",
+                               str_low_high(p),
                                pol == polarity ? "" : "(!)");
                        triggering = trig;
                        polarity = pol;