1 files changed, 25 insertions, 30 deletions

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index ce557f6f00fc..0a5570338b96 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -237,6 +237,7 @@ int show_interrupts(struct seq_file *p, void *v)
         int i = *(loff_t *) v, j, prec;
         struct irqaction *action;
         struct irq_desc *desc;
+        struct irq_chip *chip;
 
         if (i > nr_irqs)
                 return 0;
@@ -270,8 +271,9 @@ int show_interrupts(struct seq_file *p, void *v)
         for_each_online_cpu(j)
                 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
 
-        if (desc->chip)
-                seq_printf(p, "  %-16s", desc->chip->name);
+        chip = get_irq_desc_chip(desc);
+        if (chip)
+                seq_printf(p, "  %-16s", chip->name);
         else
                 seq_printf(p, "  %-16s", "None");
         seq_printf(p, " %-8s", (desc->status & IRQ_LEVEL) ? "Level" : "Edge");
@@ -313,6 +315,8 @@ void fixup_irqs(const struct cpumask *map)
         alloc_cpumask_var(&mask, GFP_KERNEL);
 
         for_each_irq(irq) {
+                struct irq_chip *chip;
+
                 desc = irq_to_desc(irq);
                 if (!desc)
                         continue;
@@ -320,13 +324,15 @@ void fixup_irqs(const struct cpumask *map)
                 if (desc->status & IRQ_PER_CPU)
                         continue;
 
-                cpumask_and(mask, desc->affinity, map);
+                chip = get_irq_desc_chip(desc);
+
+                cpumask_and(mask, desc->irq_data.affinity, map);
                 if (cpumask_any(mask) >= nr_cpu_ids) {
                         printk("Breaking affinity for irq %i\n", irq);
                         cpumask_copy(mask, map);
                 }
-                if (desc->chip->set_affinity)
-                        desc->chip->set_affinity(irq, mask);
+                if (chip->irq_set_affinity)
+                        chip->irq_set_affinity(&desc->irq_data, mask, true);
                 else if (desc->action && !(warned++))
                         printk("Cannot set affinity for irq %i\n", irq);
         }
@@ -678,16 +684,15 @@ void irq_set_virq_count(unsigned int count)
 static int irq_setup_virq(struct irq_host *host, unsigned int virq,
                             irq_hw_number_t hwirq)
 {
-        struct irq_desc *desc;
+        int res;
 
-        desc = irq_to_desc_alloc_node(virq, 0);
-        if (!desc) {
+        res = irq_alloc_desc_at(virq, 0);
+        if (res != virq) {
                 pr_debug("irq: -> allocating desc failed\n");
                 goto error;
         }
 
-        /* Clear IRQ_NOREQUEST flag */
-        desc->status &= ~IRQ_NOREQUEST;
+        irq_clear_status_flags(virq, IRQ_NOREQUEST);
 
         /* map it */
         smp_wmb();
@@ -696,11 +701,13 @@ static int irq_setup_virq(struct irq_host *host, unsigned int virq,
 
         if (host->ops->map(host, virq, hwirq)) {
                 pr_debug("irq: -> mapping failed, freeing\n");
-                goto error;
+                goto errdesc;
         }
 
         return 0;
 
+errdesc:
+        irq_free_descs(virq, 1);
 error:
         irq_free_virt(virq, 1);
         return -1;
@@ -879,9 +886,9 @@ void irq_dispose_mapping(unsigned int virq)
         smp_mb();
         irq_map[virq].hwirq = host->inval_irq;
 
-        /* Set some flags */
-        irq_to_desc(virq)->status |= IRQ_NOREQUEST;
+        irq_set_status_flags(virq, IRQ_NOREQUEST);
 
+        irq_free_descs(virq, 1);
         /* Free it */
         irq_free_virt(virq, 1);
 }
@@ -1074,21 +1081,6 @@ void irq_free_virt(unsigned int virq, unsigned int count)
 
 int arch_early_irq_init(void)
 {
-        struct irq_desc *desc;
-        int i;
-
-        for (i = 0; i < NR_IRQS; i++) {
-                desc = irq_to_desc(i);
-                if (desc)
-                        desc->status |= IRQ_NOREQUEST;
-        }
-
-        return 0;
-}
-
-int arch_init_chip_data(struct irq_desc *desc, int node)
-{
-        desc->status |= IRQ_NOREQUEST;
         return 0;
 }
 
@@ -1159,11 +1151,14 @@ static int virq_debug_show(struct seq_file *m, void *private)
                 raw_spin_lock_irqsave(&desc->lock, flags);
 
                 if (desc->action && desc->action->handler) {
+                        struct irq_chip *chip;
+
                         seq_printf(m, "%5d  ", i);
                         seq_printf(m, "0x%05lx  ", virq_to_hw(i));
 
-                        if (desc->chip && desc->chip->name)
-                                p = desc->chip->name;
+                        chip = get_irq_desc_chip(desc);
+                        if (chip && chip->name)
+                                p = chip->name;
                         else
                                 p = none;
                         seq_printf(m, "%-15s  ", p);