Merge branch 'old_next' into next

[karo-tx-linux.git] / arch / score / kernel / irq.c

diff --git a/arch/score/kernel/irq.c b/arch/score/kernel/irq.c
index ee68ec633242eff5058ef84613a197c86201ce73..d4196732c65e9ed478e5992cc3426a3cde31a634 100644 (file)
--- a/arch/score/kernel/irq.c
+++ b/arch/score/kernel/irq.c
@@ -92,7 +92,7 @@ void __init init_IRQ(void)
        unsigned long target_addr;
 
        for (index = 0; index < NR_IRQS; ++index)
-               set_irq_chip_and_handler(index, &score_irq_chip,
+               irq_set_chip_and_handler(index, &score_irq_chip,
                                         handle_level_irq);
 
        for (target_addr = IRQ_VECTOR_BASE_ADDR;
@@ -109,42 +109,3 @@ void __init init_IRQ(void)
                : : "r" (EXCEPTION_VECTOR_BASE_ADDR | \
                        VECTOR_ADDRESS_OFFSET_MODE16));
 }
-
-/*
- * Generic, controller-independent functions:
- */
-int show_interrupts(struct seq_file *p, void *v)
-{
-       int i = *(loff_t *)v, cpu;
-       struct irqaction *action;
-       unsigned long flags;
-
-       if (i == 0) {
-               seq_puts(p, "           ");
-               for_each_online_cpu(cpu)
-                       seq_printf(p, "CPU%d       ", cpu);
-               seq_putc(p, '\n');
-       }
-
-       if (i < NR_IRQS) {
-               struct irq_desc *desc = irq_to_desc(i);
-
-               raw_spin_lock_irqsave(&desc->lock, flags);
-               action = desc->action;
-               if (!action)
-                       goto unlock;
-
-               seq_printf(p, "%3d: ", i);
-               seq_printf(p, "%10u ", kstat_irqs(i));
-               seq_printf(p, " %8s", get_irq_desc_chip(desc)->name ? : "-");
-               seq_printf(p, "  %s", action->name);
-               for (action = action->next; action; action = action->next)
-                       seq_printf(p, ", %s", action->name);
-
-               seq_putc(p, '\n');
-unlock:
-               raw_spin_unlock_irqrestore(&desc->lock, flags);
-       }
-
-       return 0;
-}