parisc: Fixup last users of irq_chip->typename

The typename member of struct irq_chip was kept for migration purposes
and is obsolete since more than 2 years. Fix up the leftovers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index f47465e8d040515d27929cd5f4283a23a319ca55..efbcee5d222095c7d8ad216bcebb6f72016b3f2b 100644 (file)
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -145,7 +145,7 @@ static int cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest)
 #endif
 
 static struct irq_chip cpu_interrupt_type = {
-       .typename       = "CPU",
+       .name           = "CPU",
        .startup        = cpu_startup_irq,
        .shutdown       = cpu_disable_irq,
        .enable         = cpu_enable_irq,
@@ -192,7 +192,7 @@ int show_interrupts(struct seq_file *p, void *v)
                seq_printf(p, "%10u ", kstat_irqs(i));
 #endif
 
-               seq_printf(p, " %14s", irq_desc[i].chip->typename);
+               seq_printf(p, " %14s", irq_desc[i].chip->name);
 #ifndef PARISC_IRQ_CR16_COUNTS
                seq_printf(p, "  %s", action->name);
 

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index d69bde6a234305638cf8943857f4e93d7f1d6f4b..c542c7bb7454aff8fe600809d7e6d844eb43e24a 100644 (file)
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -354,7 +354,7 @@ static unsigned int dino_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip dino_interrupt_type = {
-       .typename       = "GSC-PCI",
+       .name           = "GSC-PCI",
        .startup        = dino_startup_irq,
        .shutdown       = dino_disable_irq,
        .enable         = dino_enable_irq, 

diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 51220749cb656805fa98a52117e799eeedee8944..46f503fb7fc553a183849b85f85c69f3be0a6a76 100644 (file)
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -189,7 +189,7 @@ static unsigned int eisa_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip eisa_interrupt_type = {
-       .typename =     "EISA",
+       .name    =      "EISA",
        .startup =      eisa_startup_irq,
        .shutdown =     eisa_disable_irq,
        .enable =       eisa_enable_irq,

diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 647adc9f85adf1118f7b294a89cac45200344b6c..c4e1f3c3c2fadd9cc1c4bf6f5e6561e803b3002d 100644 (file)
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -149,7 +149,7 @@ static unsigned int gsc_asic_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip gsc_asic_interrupt_type = {
-       .typename =     "GSC-ASIC",
+       .name    =      "GSC-ASIC",
        .startup =      gsc_asic_startup_irq,
        .shutdown =     gsc_asic_disable_irq,
        .enable =       gsc_asic_enable_irq,

diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 88e333553212c33d4c38985040c95f4fb23249b1..c76836727cae029ff39a1ecec272a95809849605 100644 (file)
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -730,7 +730,7 @@ static int iosapic_set_affinity_irq(unsigned int irq,
 #endif
 
 static struct irq_chip iosapic_interrupt_type = {
-       .typename =     "IO-SAPIC-level",
+       .name    =      "IO-SAPIC-level",
        .startup =      iosapic_startup_irq,
        .shutdown =     iosapic_disable_irq,
        .enable =       iosapic_enable_irq,

diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 675f04e6597a5d664f6f535f670be1f5c9855c9e..a35c9c5b89e8b25d39896709a1c111dbc5a6e866 100644 (file)
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -326,7 +326,7 @@ static unsigned int superio_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip superio_interrupt_type = {
-       .typename =     SUPERIO,
+       .name    =      SUPERIO,
        .startup =      superio_startup_irq,
        .shutdown =     superio_disable_irq,
        .enable =       superio_enable_irq,