1 files changed, 19 insertions, 36 deletions

diff --git a/arch/x86/kernel/uv_irq.c b/arch/x86/kernel/uv_irq.c
index 1132129db792..7b24460917d5 100644
--- a/arch/x86/kernel/uv_irq.c
+++ b/arch/x86/kernel/uv_irq.c
@@ -28,34 +28,21 @@ struct uv_irq_2_mmr_pnode{
 static spinlock_t               uv_irq_lock;
 static struct rb_root           uv_irq_root;
 
-static int uv_set_irq_affinity(unsigned int, const struct cpumask *);
+static int uv_set_irq_affinity(struct irq_data *, const struct cpumask *, bool);
 
-static void uv_noop(unsigned int irq)
-{
-}
-
-static unsigned int uv_noop_ret(unsigned int irq)
-{
-        return 0;
-}
+static void uv_noop(struct irq_data *data) { }
 
-static void uv_ack_apic(unsigned int irq)
+static void uv_ack_apic(struct irq_data *data)
 {
         ack_APIC_irq();
 }
 
 static struct irq_chip uv_irq_chip = {
-        .name           = "UV-CORE",
-        .startup        = uv_noop_ret,
-        .shutdown       = uv_noop,
-        .enable         = uv_noop,
-        .disable        = uv_noop,
-        .ack            = uv_noop,
-        .mask           = uv_noop,
-        .unmask         = uv_noop,
-        .eoi            = uv_ack_apic,
-        .end            = uv_noop,
-        .set_affinity   = uv_set_irq_affinity,
+        .name                   = "UV-CORE",
+        .irq_mask               = uv_noop,
+        .irq_unmask             = uv_noop,
+        .irq_eoi                = uv_ack_apic,
+        .irq_set_affinity       = uv_set_irq_affinity,
 };
 
 /*
@@ -144,26 +131,22 @@ arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade,
                        unsigned long mmr_offset, int limit)
 {
         const struct cpumask *eligible_cpu = cpumask_of(cpu);
-        struct irq_desc *desc = irq_to_desc(irq);
-        struct irq_cfg *cfg;
-        int mmr_pnode;
+        struct irq_cfg *cfg = get_irq_chip_data(irq);
         unsigned long mmr_value;
         struct uv_IO_APIC_route_entry *entry;
-        int err;
+        int mmr_pnode, err;
 
         BUILD_BUG_ON(sizeof(struct uv_IO_APIC_route_entry) !=
                         sizeof(unsigned long));
 
-        cfg = irq_cfg(irq);
-
         err = assign_irq_vector(irq, cfg, eligible_cpu);
         if (err != 0)
                 return err;
 
         if (limit == UV_AFFINITY_CPU)
-                desc->status |= IRQ_NO_BALANCING;
+                irq_set_status_flags(irq, IRQ_NO_BALANCING);
         else
-                desc->status |= IRQ_MOVE_PCNTXT;
+                irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);
 
         set_irq_chip_and_handler_name(irq, &uv_irq_chip, handle_percpu_irq,
                                       irq_name);
@@ -206,17 +189,17 @@ static void arch_disable_uv_irq(int mmr_pnode, unsigned long mmr_offset)
         uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value);
 }
 
-static int uv_set_irq_affinity(unsigned int irq, const struct cpumask *mask)
+static int
+uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask,
+                    bool force)
 {
-        struct irq_desc *desc = irq_to_desc(irq);
-        struct irq_cfg *cfg = desc->chip_data;
+        struct irq_cfg *cfg = data->chip_data;
         unsigned int dest;
-        unsigned long mmr_value;
+        unsigned long mmr_value, mmr_offset;
         struct uv_IO_APIC_route_entry *entry;
-        unsigned long mmr_offset;
         int mmr_pnode;
 
-        if (set_desc_affinity(desc, mask, &dest))
+        if (__ioapic_set_affinity(data, mask, &dest))
                 return -1;
 
         mmr_value = 0;
@@ -231,7 +214,7 @@ static int uv_set_irq_affinity(unsigned int irq, const struct cpumask *mask)
         entry->dest             = dest;
 
         /* Get previously stored MMR and pnode of hub sourcing interrupts */
-        if (uv_irq_2_mmr_info(irq, &mmr_offset, &mmr_pnode))
+        if (uv_irq_2_mmr_info(data->irq, &mmr_offset, &mmr_pnode))
                 return -1;
 
         uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value);