diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 64f233a..f185a1e 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2523,7 +2523,6 @@ void __init setup_ioapic_dest(void)
 	const struct cpumask *mask;
 	struct irq_desc *desc;
 	struct irq_data *idata;
-	struct irq_chip *chip;
 
 	if (skip_ioapic_setup == 1)
 		return;
@@ -2549,10 +2548,7 @@ void __init setup_ioapic_dest(void)
 		else
 			mask = apic->target_cpus();
 
-		chip = irq_data_get_irq_chip(idata);
-		/* Might be lapic_chip for irq 0 */
-		if (chip->irq_set_affinity)
-			chip->irq_set_affinity(idata, mask, false);
+		irq_set_affinity_locked(idata, mask, false);
 		raw_spin_unlock_irq(&desc->lock);
 	}
 }