Skip to content

Commit

Permalink
parisc: Fixup last users of irq_chip->typename
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner authored and Kyle McMartin committed Dec 16, 2009
1 parent 217bfb5 commit d0608b5
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions arch/parisc/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/parisc/dino.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/parisc/eisa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/parisc/gsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/parisc/iosapic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/parisc/superio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d0608b5

Please sign in to comment.