Message ID | 1259700494-17869-1-git-send-email-jacmet@sunsite.dk (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Kumar Gala |
Headers | show |
>>>>> "Peter" == Peter Korsgaard <jacmet@sunsite.dk> writes:
Peter> struct irq_chip::typename is going away (replaced by name). Use name if
Peter> set instead of typename in show_interrupt to make ease transition.
Comments?
Peter> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter> ---
Peter> arch/powerpc/kernel/irq.c | 3 ++-
Peter> 1 files changed, 2 insertions(+), 1 deletions(-)
Peter> diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
Peter> index e5d1211..33e1130 100644
Peter> --- a/arch/powerpc/kernel/irq.c
Peter> +++ b/arch/powerpc/kernel/irq.c
Peter> @@ -203,7 +203,8 @@ int show_interrupts(struct seq_file *p, void *v)
Peter> seq_printf(p, "%10u ", kstat_irqs(i));
Peter> #endif /* CONFIG_SMP */
Peter> if (desc->chip)
Peter> - seq_printf(p, " %s ", desc->chip->typename);
Peter> + seq_printf(p, " %s ", desc->chip->name ?
Peter> + desc->chip->name : desc->chip->typename);
Peter> else
Peter> seq_puts(p, " None ");
Peter> seq_printf(p, "%s", (desc->status & IRQ_LEVEL) ? "Level " : "Edge ");
Peter> --
Peter> 1.6.5
On Wed, 2009-12-09 at 08:32 +0100, Peter Korsgaard wrote: > >>>>> "Peter" == Peter Korsgaard <jacmet@sunsite.dk> writes: > > Peter> struct irq_chip::typename is going away (replaced by name). Use name if > Peter> set instead of typename in show_interrupt to make ease transition. > > Comments? Hi Peter ! There's already a patch in my -next tree from Thomas Gleixner that fixes that up along with a few others in arch/powerpc. Cheers, Ben. > Peter> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> > Peter> --- > Peter> arch/powerpc/kernel/irq.c | 3 ++- > Peter> 1 files changed, 2 insertions(+), 1 deletions(-) > > Peter> diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c > Peter> index e5d1211..33e1130 100644 > Peter> --- a/arch/powerpc/kernel/irq.c > Peter> +++ b/arch/powerpc/kernel/irq.c > Peter> @@ -203,7 +203,8 @@ int show_interrupts(struct seq_file *p, void *v) > Peter> seq_printf(p, "%10u ", kstat_irqs(i)); > Peter> #endif /* CONFIG_SMP */ > Peter> if (desc->chip) > Peter> - seq_printf(p, " %s ", desc->chip->typename); > Peter> + seq_printf(p, " %s ", desc->chip->name ? > Peter> + desc->chip->name : desc->chip->typename); > Peter> else > Peter> seq_puts(p, " None "); > Peter> seq_printf(p, "%s", (desc->status & IRQ_LEVEL) ? "Level " : "Edge "); > Peter> -- > Peter> 1.6.5 > >
>>>>> "Benjamin" == Benjamin Herrenschmidt <benh@kernel.crashing.org> writes: Benjamin> On Wed, 2009-12-09 at 08:32 +0100, Peter Korsgaard wrote: >> >>>>> "Peter" == Peter Korsgaard <jacmet@sunsite.dk> writes: >> Peter> struct irq_chip::typename is going away (replaced by name). Use name if Peter> set instead of typename in show_interrupt to make ease transition. >> >> Comments? Benjamin> Hi Peter ! Benjamin> There's already a patch in my -next tree from Thomas Gleixner Benjamin> that fixes that up along with a few others in arch/powerpc. Ahh, ok - Hadn't noticed - Sorry.
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index e5d1211..33e1130 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -203,7 +203,8 @@ int show_interrupts(struct seq_file *p, void *v) seq_printf(p, "%10u ", kstat_irqs(i)); #endif /* CONFIG_SMP */ if (desc->chip) - seq_printf(p, " %s ", desc->chip->typename); + seq_printf(p, " %s ", desc->chip->name ? + desc->chip->name : desc->chip->typename); else seq_puts(p, " None "); seq_printf(p, "%s", (desc->status & IRQ_LEVEL) ? "Level " : "Edge ");
struct irq_chip::typename is going away (replaced by name). Use name if set instead of typename in show_interrupt to make ease transition. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> --- arch/powerpc/kernel/irq.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)