[PATCH] irq: Remove set_native_irq_info

This patch replaces all instances of "set_native_irq_info(irq, mask)"
with "irq_desc[irq].affinity = mask".  The latter form is clearer
uses fewer abstractions, and makes access to this field uniform
accross different architectures.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 357b354921c1..184721348f59 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -261,7 +261,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
 
         spin_lock_irqsave(&ioapic_lock, flags);
         __target_IO_APIC_irq(irq, dest, vector);
-        set_native_irq_info(irq, mask);
+        irq_desc[irq].affinity = mask;
         spin_unlock_irqrestore(&ioapic_lock, flags);
 }
 #endif
@@ -857,7 +857,7 @@ static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
         ioapic_write_entry(apic, pin, entry);
 
         spin_lock_irqsave(&ioapic_lock, flags);
-        set_native_irq_info(irq, TARGET_CPUS);
+        irq_desc[irq].affinity = TARGET_CPUS;
         spin_unlock_irqrestore(&ioapic_lock, flags);
 
 }
@@ -1930,7 +1930,7 @@ static void set_msi_irq_affinity(unsigned int irq, cpumask_t mask)
         msg.address_lo |= MSI_ADDR_DEST_ID(dest);
 
         write_msi_msg(irq, &msg);
-        set_native_irq_info(irq, mask);
+        irq_desc[irq].affinity = mask;
 }
 #endif /* CONFIG_SMP */
 
@@ -2018,7 +2018,7 @@ static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask)
         dest = cpu_mask_to_apicid(tmp);
 
         target_ht_irq(irq, dest, vector);
-        set_native_irq_info(irq, mask);
+        irq_desc[irq].affinity = mask;
 }
 #endif
 
@@ -2143,7 +2143,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int p
         ioapic_write_entry(ioapic, pin, entry);
 
         spin_lock_irqsave(&ioapic_lock, flags);
-        set_native_irq_info(irq, TARGET_CPUS);
+        irq_desc[irq].affinity = TARGET_CPUS;
         spin_unlock_irqrestore(&ioapic_lock, flags);
 
         return 0;