x86/ioapic: Cleanup line breaks

80 character limit is history.

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/20240802155441.095653193@linutronix.de

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 8d81c471edf09f82e2e50d2eeb8dac6e586b398f..051779faa43df29a4767818e36ced6899b938fda 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -637,10 +637,8 @@ static int __init find_isa_irq_pin(int irq, int type)
        for (i = 0; i < mp_irq_entries; i++) {
                int lbus = mp_irqs[i].srcbus;
 
-               if (test_bit(lbus, mp_bus_not_pci) &&
-                   (mp_irqs[i].irqtype == type) &&
+               if (test_bit(lbus, mp_bus_not_pci) && (mp_irqs[i].irqtype == type) &&
                    (mp_irqs[i].srcbusirq == irq))
-
                        return mp_irqs[i].dstirq;
        }
        return -1;
@@ -653,8 +651,7 @@ static int __init find_isa_irq_apic(int irq, int type)
        for (i = 0; i < mp_irq_entries; i++) {
                int lbus = mp_irqs[i].srcbus;
 
-               if (test_bit(lbus, mp_bus_not_pci) &&
-                   (mp_irqs[i].irqtype == type) &&
+               if (test_bit(lbus, mp_bus_not_pci) && (mp_irqs[i].irqtype == type) &&
                    (mp_irqs[i].srcbusirq == irq))
                        break;
        }
@@ -907,8 +904,7 @@ static int alloc_irq_from_domain(struct irq_domain *domain, int ioapic, u32 gsi,
                return -1;
        }
 
-       return __irq_domain_alloc_irqs(domain, irq, 1,
-                                      ioapic_alloc_attr_node(info),
+       return __irq_domain_alloc_irqs(domain, irq, 1, ioapic_alloc_attr_node(info),
                                       info, legacy, NULL);
 }
 
@@ -922,13 +918,12 @@ static int alloc_irq_from_domain(struct irq_domain *domain, int ioapic, u32 gsi,
  * PIRQs instead of reprogramming the interrupt routing logic. Thus there may be
  * multiple pins sharing the same legacy IRQ number when ACPI is disabled.
  */
-static int alloc_isa_irq_from_domain(struct irq_domain *domain,
-                                    int irq, int ioapic, int pin,
+static int alloc_isa_irq_from_domain(struct irq_domain *domain, int irq, int ioapic, int pin,
                                     struct irq_alloc_info *info)
 {
-       struct mp_chip_data *data;
        struct irq_data *irq_data = irq_get_irq_data(irq);
        int node = ioapic_alloc_attr_node(info);
+       struct mp_chip_data *data;
 
        /*
         * Legacy ISA IRQ has already been allocated, just add pin to
@@ -942,8 +937,7 @@ static int alloc_isa_irq_from_domain(struct irq_domain *domain,
                        return -ENOMEM;
        } else {
                info->flags |= X86_IRQ_ALLOC_LEGACY;
-               irq = __irq_domain_alloc_irqs(domain, irq, 1, node, info, true,
-                                             NULL);
+               irq = __irq_domain_alloc_irqs(domain, irq, 1, node, info, true, NULL);
                if (irq >= 0) {
                        irq_data = irq_domain_get_irq_data(domain, irq);
                        data = irq_data->chip_data;
@@ -1121,8 +1115,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin)
                return -1;
 
 out:
-       return pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq,
-                        IOAPIC_MAP_ALLOC);
+       return pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq, IOAPIC_MAP_ALLOC);
 }
 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
 
@@ -1293,14 +1286,12 @@ void __init enable_IO_APIC(void)
                 * If the interrupt line is enabled and in ExtInt mode I
                 * have found the pin where the i8259 is connected.
                 */
-               if (!entry.masked &&
-                   entry.delivery_mode == APIC_DELIVERY_MODE_EXTINT) {
+               if (!entry.masked && entry.delivery_mode == APIC_DELIVERY_MODE_EXTINT) {
                        ioapic_i8259.apic = apic;
                        ioapic_i8259.pin  = pin;
-                       goto found_i8259;
+                       break;
                }
        }
- found_i8259:
 
        /*
         * Look to see what if the MP table has reported the ExtINT
@@ -1496,8 +1487,7 @@ static void __init delay_with_tsc(void)
        do {
                rep_nop();
                now = rdtsc();
-       } while ((now - start) < 40000000000ULL / HZ &&
-               time_before_eq(jiffies, end));
+       } while ((now - start) < 40000000000ULL / HZ && time_before_eq(jiffies, end));
 }
 
 static void __init delay_without_tsc(void)
@@ -1912,20 +1902,17 @@ static inline void init_IO_APIC_traps(void)
 /*
  * The local APIC irq-chip implementation:
  */
-
 static void mask_lapic_irq(struct irq_data *data)
 {
-       unsigned long v;
+       unsigned long v = apic_read(APIC_LVT0);
 
-       v = apic_read(APIC_LVT0);
        apic_write(APIC_LVT0, v | APIC_LVT_MASKED);
 }
 
 static void unmask_lapic_irq(struct irq_data *data)
 {
-       unsigned long v;
+       unsigned long v = apic_read(APIC_LVT0);
 
-       v = apic_read(APIC_LVT0);
        apic_write(APIC_LVT0, v & ~APIC_LVT_MASKED);
 }
 
@@ -1944,8 +1931,7 @@ static struct irq_chip lapic_chip __read_mostly = {
 static void lapic_register_intr(int irq)
 {
        irq_clear_status_flags(irq, IRQ_LEVEL);
-       irq_set_chip_and_handler_name(irq, &lapic_chip, handle_edge_irq,
-                                     "edge");
+       irq_set_chip_and_handler_name(irq, &lapic_chip, handle_edge_irq, "edge");
 }
 
 /*
@@ -2265,10 +2251,8 @@ static int mp_irqdomain_create(int ioapic)
                return -ENOMEM;
        }
 
-       if (cfg->type == IOAPIC_DOMAIN_LEGACY ||
-           cfg->type == IOAPIC_DOMAIN_STRICT)
-               ioapic_dynirq_base = max(ioapic_dynirq_base,
-                                        gsi_cfg->gsi_end + 1);
+       if (cfg->type == IOAPIC_DOMAIN_LEGACY || cfg->type == IOAPIC_DOMAIN_STRICT)
+               ioapic_dynirq_base = max(ioapic_dynirq_base, gsi_cfg->gsi_end + 1);
 
        return 0;
 }
@@ -2682,8 +2666,7 @@ static int find_free_ioapic_entry(void)
  * @gsi_base:  base of GSI associated with the IOAPIC
  * @cfg:       configuration information for the IOAPIC
  */
-int mp_register_ioapic(int id, u32 address, u32 gsi_base,
-                      struct ioapic_domain_cfg *cfg)
+int mp_register_ioapic(int id, u32 address, u32 gsi_base, struct ioapic_domain_cfg *cfg)
 {
        bool hotplug = !!ioapic_initialized;
        struct mp_ioapic_gsi *gsi_cfg;
@@ -2835,8 +2818,7 @@ static void mp_irqdomain_get_attr(u32 gsi, struct mp_chip_data *data,
        if (info && info->ioapic.valid) {
                data->is_level = info->ioapic.is_level;
                data->active_low = info->ioapic.active_low;
-       } else if (__acpi_get_override_irq(gsi, &data->is_level,
-                                          &data->active_low) < 0) {
+       } else if (__acpi_get_override_irq(gsi, &data->is_level, &data->active_low) < 0) {
                /* PCI interrupts are always active low level triggered. */
                data->is_level = true;
                data->active_low = true;
@@ -2956,8 +2938,7 @@ void mp_irqdomain_deactivate(struct irq_domain *domain,
                             struct irq_data *irq_data)
 {
        /* It won't be called for IRQ with multiple IOAPIC pins associated */
-       ioapic_mask_entry(mp_irqdomain_ioapic_idx(domain),
-                         (int)irq_data->hwirq);
+       ioapic_mask_entry(mp_irqdomain_ioapic_idx(domain), (int)irq_data->hwirq);
 }
 
 int mp_irqdomain_ioapic_idx(struct irq_domain *domain)