]> www.infradead.org Git - linux.git/commitdiff
x86/ioapic: Move replace_pin_at_irq_node() to the call site
authorThomas Gleixner <tglx@linutronix.de>
Fri, 2 Aug 2024 16:15:47 +0000 (18:15 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 7 Aug 2024 16:13:28 +0000 (18:13 +0200)
It's only used by check_timer().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Tested-by: Breno Leitao <leitao@debian.org>
Link: https://lore.kernel.org/all/20240802155440.906636514@linutronix.de
arch/x86/kernel/apic/io_apic.c

index 3669b5d275189be59e7206498f11fdd61c5d8b6a..51ecfb5582dc5d7be911cae29e2a08e66986e441 100644 (file)
@@ -370,28 +370,6 @@ static void __remove_pin_from_irq(struct mp_chip_data *data, int apic, int pin)
                }
 }
 
-/*
- * Reroute an IRQ to a different pin.
- */
-static void __init replace_pin_at_irq_node(struct mp_chip_data *data, int node,
-                                          int oldapic, int oldpin,
-                                          int newapic, int newpin)
-{
-       struct irq_pin_list *entry;
-
-       for_each_irq_pin(entry, data->irq_2_pin) {
-               if (entry->apic == oldapic && entry->pin == oldpin) {
-                       entry->apic = newapic;
-                       entry->pin = newpin;
-                       /* every one is different, right? */
-                       return;
-               }
-       }
-
-       /* old apic/pin didn't exist, so just add new ones */
-       add_pin_to_irq_node(data, node, newapic, newpin);
-}
-
 static void io_apic_modify_irq(struct mp_chip_data *data, bool masked,
                               void (*final)(struct irq_pin_list *entry))
 {
@@ -2067,6 +2045,24 @@ static int __init mp_alloc_timer_irq(int ioapic, int pin)
        return irq;
 }
 
+static void __init replace_pin_at_irq_node(struct mp_chip_data *data, int node,
+                                          int oldapic, int oldpin,
+                                          int newapic, int newpin)
+{
+       struct irq_pin_list *entry;
+
+       for_each_irq_pin(entry, data->irq_2_pin) {
+               if (entry->apic == oldapic && entry->pin == oldpin) {
+                       entry->apic = newapic;
+                       entry->pin = newpin;
+                       return;
+               }
+       }
+
+       /* Old apic/pin didn't exist, so just add a new one */
+       add_pin_to_irq_node(data, node, newapic, newpin);
+}
+
 /*
  * This code may look a bit paranoid, but it's supposed to cooperate with
  * a wide range of boards and BIOS bugs.  Fortunately only the timer IRQ