sh: Updates for irq-flow-type naming changes.

handle_irq_name() and set_irq_chip_and_handler() disappeared,
update for desc->name and set_irq_chip_and_handler_name() use.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

4 files changed, 10 insertions, 8 deletions

diff --git a/arch/sh/boards/renesas/r7780rp/irq.c b/arch/sh/boards/renesas/r7780rp/irq.c
index cbb4ea28e9ad..aa15ec5bc69e 100644
--- a/arch/sh/boards/renesas/r7780rp/irq.c
+++ b/arch/sh/boards/renesas/r7780rp/irq.c
@@ -33,7 +33,7 @@ static void disable_r7780rp_irq(unsigned int irq)
 }
 
 static struct irq_chip r7780rp_irq_chip __read_mostly = {
-        .name           = "r7780rp",
+        .name           = "R7780RP",
         .mask           = disable_r7780rp_irq,
         .unmask         = enable_r7780rp_irq,
         .mask_ack       = disable_r7780rp_irq,
@@ -48,8 +48,8 @@ void __init init_r7780rp_IRQ(void)
 
         for (i = 0; i < 15; i++) {
                 disable_irq_nosync(i);
-                set_irq_chip_and_handler(i, &r7780rp_irq_chip,
-                                         handle_level_irq);
+                set_irq_chip_and_handler_name(i, &r7780rp_irq_chip,
+                                              handle_level_irq, "level");
                 enable_r7780rp_irq(i);
         }
 }
diff --git a/arch/sh/kernel/cpu/irq/intc2.c b/arch/sh/kernel/cpu/irq/intc2.c
index d4b2bb7e08c7..212884adca03 100644
--- a/arch/sh/kernel/cpu/irq/intc2.c
+++ b/arch/sh/kernel/cpu/irq/intc2.c
@@ -31,7 +31,7 @@ static void enable_intc2_irq(unsigned int irq)
 }
 
 static struct irq_chip intc2_irq_chip = {
-        .typename       = "intc2",
+        .name           = "INTC2",
         .mask           = disable_intc2_irq,
         .unmask         = enable_intc2_irq,
         .mask_ack       = disable_intc2_irq,
@@ -64,7 +64,8 @@ void make_intc2_irq(struct intc2_data *p)
 
         local_irq_restore(flags);
 
-        set_irq_chip_and_handler(p->irq, &intc2_irq_chip, handle_level_irq);
+        set_irq_chip_and_handler_name(p->irq, &intc2_irq_chip,
+                                      handle_level_irq, "level");
         set_irq_chip_data(p->irq, p);
 
         enable_intc2_irq(p->irq);
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index 8944abdf6e1c..f7997312ef98 100644
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -44,7 +44,7 @@ static void enable_ipr_irq(unsigned int irq)
 }
 
 static struct irq_chip ipr_irq_chip = {
-        .name           = "ipr",
+        .name           = "IPR",
         .mask           = disable_ipr_irq,
         .unmask         = enable_ipr_irq,
         .mask_ack       = disable_ipr_irq,
@@ -60,7 +60,8 @@ void make_ipr_irq(unsigned int irq, unsigned int addr, int pos, int priority)
         ipr_data.shift = pos*4; /* POSition (0-3) x 4 means shift */
         ipr_data.priority = priority;
 
-        set_irq_chip_and_handler(irq, &ipr_irq_chip, handle_level_irq);
+        set_irq_chip_and_handler_name(irq, &ipr_irq_chip,
+                                      handle_level_irq, "level");
         set_irq_chip_data(irq, &ipr_data);
 
         enable_ipr_irq(irq);
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index acf2602569c4..944128ce9706 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -54,7 +54,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
                 seq_printf(p, " %14s", irq_desc[i].chip->name);
-                seq_printf(p, "-%s", handle_irq_name(irq_desc[i].handle_irq));
+                seq_printf(p, "-%-8s", irq_desc[i].name);
                 seq_printf(p, "  %s", action->name);
 
                 for (action=action->next; action; action = action->next)