Browse Source

x86: ioapic: Avoid redundant lookup of irq_cfg

The caller of ioapic_register_intr() has a pointer to the irq_cfg for
the irq already. Hand it in to avoid a full lookup.

In msi_compose_msg() the pointer to irq_cfg is already available. No
need to look it up again.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Thomas Gleixner 14 years ago
parent
commit
1a0e62a49a
1 changed files with 5 additions and 4 deletions
  1. 5 4
      arch/x86/kernel/apic/io_apic.c

+ 5 - 4
arch/x86/kernel/apic/io_apic.c

@@ -1240,7 +1240,8 @@ static inline int IO_APIC_irq_trigger(int irq)
 }
 }
 #endif
 #endif
 
 
-static void ioapic_register_intr(unsigned int irq, unsigned long trigger)
+static void ioapic_register_intr(unsigned int irq, struct irq_cfg *cfg,
+				 unsigned long trigger)
 {
 {
 	struct irq_chip *chip = &ioapic_chip;
 	struct irq_chip *chip = &ioapic_chip;
 	irq_flow_handler_t hdl;
 	irq_flow_handler_t hdl;
@@ -1255,7 +1256,7 @@ static void ioapic_register_intr(unsigned int irq, unsigned long trigger)
 		fasteoi = false;
 		fasteoi = false;
 	}
 	}
 
 
-	if (irq_remapped(irq_get_chip_data(irq))) {
+	if (irq_remapped(cfg)) {
 		irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);
 		irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);
 		chip = &ir_ioapic_chip;
 		chip = &ir_ioapic_chip;
 		fasteoi = trigger != 0;
 		fasteoi = trigger != 0;
@@ -1361,7 +1362,7 @@ static void setup_ioapic_irq(int apic_id, int pin, unsigned int irq,
 		return;
 		return;
 	}
 	}
 
 
-	ioapic_register_intr(irq, trigger);
+	ioapic_register_intr(irq, cfg, trigger);
 	if (irq < legacy_pic->nr_legacy_irqs)
 	if (irq < legacy_pic->nr_legacy_irqs)
 		legacy_pic->mask(irq);
 		legacy_pic->mask(irq);
 
 
@@ -3088,7 +3089,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,
 
 
 	dest = apic->cpu_mask_to_apicid_and(cfg->domain, apic->target_cpus());
 	dest = apic->cpu_mask_to_apicid_and(cfg->domain, apic->target_cpus());
 
 
-	if (irq_remapped(irq_get_chip_data(irq))) {
+	if (irq_remapped(cfg)) {
 		struct irte irte;
 		struct irte irte;
 		int ir_index;
 		int ir_index;
 		u16 sub_handle;
 		u16 sub_handle;