Skip to content

Commit

Permalink
sparc: 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: David S. Miller <davem@davemloft.net>
  • Loading branch information
Thomas Gleixner authored and David S. Miller committed Nov 18, 2009
1 parent 4309e56 commit 89a7183
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions arch/sparc/kernel/irq_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ int show_interrupts(struct seq_file *p, void *v)
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif
seq_printf(p, " %9s", irq_desc[i].chip->typename);
seq_printf(p, " %9s", irq_desc[i].chip->name);
seq_printf(p, " %s", action->name);

for (action=action->next; action; action = action->next)
Expand Down Expand Up @@ -484,23 +484,23 @@ static void sun4v_virq_eoi(unsigned int virt_irq)
}

static struct irq_chip sun4u_irq = {
.typename = "sun4u",
.name = "sun4u",
.enable = sun4u_irq_enable,
.disable = sun4u_irq_disable,
.eoi = sun4u_irq_eoi,
.set_affinity = sun4u_set_affinity,
};

static struct irq_chip sun4v_irq = {
.typename = "sun4v",
.name = "sun4v",
.enable = sun4v_irq_enable,
.disable = sun4v_irq_disable,
.eoi = sun4v_irq_eoi,
.set_affinity = sun4v_set_affinity,
};

static struct irq_chip sun4v_virq = {
.typename = "vsun4v",
.name = "vsun4v",
.enable = sun4v_virq_enable,
.disable = sun4v_virq_disable,
.eoi = sun4v_virq_eoi,
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc/kernel/pci_msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static void free_msi(struct pci_pbm_info *pbm, int msi_num)
}

static struct irq_chip msi_irq = {
.typename = "PCI-MSI",
.name = "PCI-MSI",
.mask = mask_msi_irq,
.unmask = unmask_msi_irq,
.enable = unmask_msi_irq,
Expand Down

0 comments on commit 89a7183

Please sign in to comment.