* [patch 0/2] unicore32: Final irq bits for .39
@ 2011-03-25 14:26 Thomas Gleixner
2011-03-25 14:26 ` [patch 1/2] unicore32: Convert to new irq function names Thomas Gleixner
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Thomas Gleixner @ 2011-03-25 14:26 UTC (permalink / raw)
To: LKML; +Cc: Guan Xuetao
Guan,
the following series converts unicore to the new irq function names
and makes use of the generic show_interrupts() implementation.
Can you please ack or send it to Linus yourself?
Thanks,
tglx
^ permalink raw reply [flat|nested] 6+ messages in thread* [patch 1/2] unicore32: Convert to new irq function names 2011-03-25 14:26 [patch 0/2] unicore32: Final irq bits for .39 Thomas Gleixner @ 2011-03-25 14:26 ` Thomas Gleixner 2011-03-29 14:09 ` Guan Xuetao 2011-03-25 14:26 ` [patch 2/2] unicore32: Use generic show_interrupts() Thomas Gleixner 2011-03-29 14:09 ` [patch 0/2] unicore32: Final irq bits for .39 Guan Xuetao 2 siblings, 1 reply; 6+ messages in thread From: Thomas Gleixner @ 2011-03-25 14:26 UTC (permalink / raw) To: LKML; +Cc: Guan Xuetao [-- Attachment #1: unicore-namespace.patch --] [-- Type: text/plain, Size: 1776 bytes --] Scripted with coccinelle. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- arch/unicore32/kernel/irq.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Index: linux-2.6-tip/arch/unicore32/kernel/irq.c =================================================================== --- linux-2.6-tip.orig/arch/unicore32/kernel/irq.c +++ linux-2.6-tip/arch/unicore32/kernel/irq.c @@ -321,24 +321,24 @@ void __init init_IRQ(void) writel(1, INTC_ICCR); for (irq = 0; irq < IRQ_GPIOHIGH; irq++) { - set_irq_chip(irq, &puv3_low_gpio_chip); - set_irq_handler(irq, handle_edge_irq); + irq_set_chip(irq, &puv3_low_gpio_chip); + irq_set_handler(irq, handle_edge_irq); irq_modify_status(irq, IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN, 0); } for (irq = IRQ_GPIOHIGH + 1; irq < IRQ_GPIO0; irq++) { - set_irq_chip(irq, &puv3_normal_chip); - set_irq_handler(irq, handle_level_irq); + irq_set_chip(irq, &puv3_normal_chip); + irq_set_handler(irq, handle_level_irq); irq_modify_status(irq, IRQ_NOREQUEST | IRQ_NOAUTOEN, IRQ_NOPROBE); } for (irq = IRQ_GPIO0; irq <= IRQ_GPIO27; irq++) { - set_irq_chip(irq, &puv3_high_gpio_chip); - set_irq_handler(irq, handle_edge_irq); + irq_set_chip(irq, &puv3_high_gpio_chip); + irq_set_handler(irq, handle_edge_irq); irq_modify_status(irq, IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN, 0); @@ -347,8 +347,8 @@ void __init init_IRQ(void) /* * Install handler for GPIO 0-27 edge detect interrupts */ - set_irq_chip(IRQ_GPIOHIGH, &puv3_normal_chip); - set_irq_chained_handler(IRQ_GPIOHIGH, puv3_gpio_handler); + irq_set_chip(IRQ_GPIOHIGH, &puv3_normal_chip); + irq_set_chained_handler(IRQ_GPIOHIGH, puv3_gpio_handler); #ifdef CONFIG_PUV3_GPIO puv3_init_gpio(); ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [patch 1/2] unicore32: Convert to new irq function names 2011-03-25 14:26 ` [patch 1/2] unicore32: Convert to new irq function names Thomas Gleixner @ 2011-03-29 14:09 ` Guan Xuetao 0 siblings, 0 replies; 6+ messages in thread From: Guan Xuetao @ 2011-03-29 14:09 UTC (permalink / raw) To: 'Thomas Gleixner', 'LKML' Applied, thx. Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn> > -----Original Message----- > From: Thomas Gleixner [mailto:tglx@linutronix.de] > Sent: Friday, March 25, 2011 10:27 PM > To: LKML > Cc: Guan Xuetao > Subject: [patch 1/2] unicore32: Convert to new irq function names > > Scripted with coccinelle. > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > --- > arch/unicore32/kernel/irq.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > Index: linux-2.6-tip/arch/unicore32/kernel/irq.c > =================================================================== > --- linux-2.6-tip.orig/arch/unicore32/kernel/irq.c > +++ linux-2.6-tip/arch/unicore32/kernel/irq.c > @@ -321,24 +321,24 @@ void __init init_IRQ(void) > writel(1, INTC_ICCR); > > for (irq = 0; irq < IRQ_GPIOHIGH; irq++) { > - set_irq_chip(irq, &puv3_low_gpio_chip); > - set_irq_handler(irq, handle_edge_irq); > + irq_set_chip(irq, &puv3_low_gpio_chip); > + irq_set_handler(irq, handle_edge_irq); > irq_modify_status(irq, > IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN, > 0); > } > > for (irq = IRQ_GPIOHIGH + 1; irq < IRQ_GPIO0; irq++) { > - set_irq_chip(irq, &puv3_normal_chip); > - set_irq_handler(irq, handle_level_irq); > + irq_set_chip(irq, &puv3_normal_chip); > + irq_set_handler(irq, handle_level_irq); > irq_modify_status(irq, > IRQ_NOREQUEST | IRQ_NOAUTOEN, > IRQ_NOPROBE); > } > > for (irq = IRQ_GPIO0; irq <= IRQ_GPIO27; irq++) { > - set_irq_chip(irq, &puv3_high_gpio_chip); > - set_irq_handler(irq, handle_edge_irq); > + irq_set_chip(irq, &puv3_high_gpio_chip); > + irq_set_handler(irq, handle_edge_irq); > irq_modify_status(irq, > IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN, > 0); > @@ -347,8 +347,8 @@ void __init init_IRQ(void) > /* > * Install handler for GPIO 0-27 edge detect interrupts > */ > - set_irq_chip(IRQ_GPIOHIGH, &puv3_normal_chip); > - set_irq_chained_handler(IRQ_GPIOHIGH, puv3_gpio_handler); > + irq_set_chip(IRQ_GPIOHIGH, &puv3_normal_chip); > + irq_set_chained_handler(IRQ_GPIOHIGH, puv3_gpio_handler); > > #ifdef CONFIG_PUV3_GPIO > puv3_init_gpio(); ^ permalink raw reply [flat|nested] 6+ messages in thread
* [patch 2/2] unicore32: Use generic show_interrupts() 2011-03-25 14:26 [patch 0/2] unicore32: Final irq bits for .39 Thomas Gleixner 2011-03-25 14:26 ` [patch 1/2] unicore32: Convert to new irq function names Thomas Gleixner @ 2011-03-25 14:26 ` Thomas Gleixner 2011-03-29 14:10 ` Guan Xuetao 2011-03-29 14:09 ` [patch 0/2] unicore32: Final irq bits for .39 Guan Xuetao 2 siblings, 1 reply; 6+ messages in thread From: Thomas Gleixner @ 2011-03-25 14:26 UTC (permalink / raw) To: LKML; +Cc: Guan Xuetao [-- Attachment #1: unicore-show.patch --] [-- Type: text/plain, Size: 2098 bytes --] Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- arch/unicore32/Kconfig | 1 + arch/unicore32/kernel/irq.c | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 42 deletions(-) Index: linux-2.6-tip/arch/unicore32/Kconfig =================================================================== --- linux-2.6-tip.orig/arch/unicore32/Kconfig +++ linux-2.6-tip/arch/unicore32/Kconfig @@ -11,6 +11,7 @@ config UNICORE32 select GENERIC_FIND_FIRST_BIT select GENERIC_IRQ_PROBE select GENERIC_HARDIRQS_NO_DEPRECATED + select GENERIC_IRQ_SHOW select ARCH_WANT_FRAME_POINTERS help UniCore-32 is 32-bit Instruction Set Architecture, Index: linux-2.6-tip/arch/unicore32/kernel/irq.c =================================================================== --- linux-2.6-tip.orig/arch/unicore32/kernel/irq.c +++ linux-2.6-tip/arch/unicore32/kernel/irq.c @@ -355,48 +355,6 @@ void __init init_IRQ(void) #endif } -int show_interrupts(struct seq_file *p, void *v) -{ - int i = *(loff_t *) v, cpu; - struct irq_desc *desc; - struct irqaction *action; - unsigned long flags; - - if (i == 0) { - char cpuname[12]; - - seq_printf(p, " "); - for_each_present_cpu(cpu) { - sprintf(cpuname, "CPU%d", cpu); - seq_printf(p, " %10s", cpuname); - } - seq_putc(p, '\n'); - } - - if (i < nr_irqs) { - desc = irq_to_desc(i); - raw_spin_lock_irqsave(&desc->lock, flags); - action = desc->action; - if (!action) - goto unlock; - - seq_printf(p, "%3d: ", i); - for_each_present_cpu(cpu) - seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu)); - seq_printf(p, " %10s", desc->irq_data.chip->name ? : "-"); - seq_printf(p, " %s", action->name); - for (action = action->next; action; action = action->next) - seq_printf(p, ", %s", action->name); - - seq_putc(p, '\n'); -unlock: - raw_spin_unlock_irqrestore(&desc->lock, flags); - } else if (i == nr_irqs) { - seq_printf(p, "Error in interrupt!\n"); - } - return 0; -} - /* * do_IRQ handles all hardware IRQ's. Decoded IRQs should not * come via this function. Instead, they should provide their ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [patch 2/2] unicore32: Use generic show_interrupts() 2011-03-25 14:26 ` [patch 2/2] unicore32: Use generic show_interrupts() Thomas Gleixner @ 2011-03-29 14:10 ` Guan Xuetao 0 siblings, 0 replies; 6+ messages in thread From: Guan Xuetao @ 2011-03-29 14:10 UTC (permalink / raw) To: 'Thomas Gleixner', 'LKML' Applied, thx. Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn> > -----Original Message----- > From: Thomas Gleixner [mailto:tglx@linutronix.de] > Sent: Friday, March 25, 2011 10:27 PM > To: LKML > Cc: Guan Xuetao > Subject: [patch 2/2] unicore32: Use generic show_interrupts() > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > --- > arch/unicore32/Kconfig | 1 + > arch/unicore32/kernel/irq.c | 42 ------------------------------------------ > 2 files changed, 1 insertion(+), 42 deletions(-) > > Index: linux-2.6-tip/arch/unicore32/Kconfig > =================================================================== > --- linux-2.6-tip.orig/arch/unicore32/Kconfig > +++ linux-2.6-tip/arch/unicore32/Kconfig > @@ -11,6 +11,7 @@ config UNICORE32 > select GENERIC_FIND_FIRST_BIT > select GENERIC_IRQ_PROBE > select GENERIC_HARDIRQS_NO_DEPRECATED > + select GENERIC_IRQ_SHOW > select ARCH_WANT_FRAME_POINTERS > help > UniCore-32 is 32-bit Instruction Set Architecture, > Index: linux-2.6-tip/arch/unicore32/kernel/irq.c > =================================================================== > --- linux-2.6-tip.orig/arch/unicore32/kernel/irq.c > +++ linux-2.6-tip/arch/unicore32/kernel/irq.c > @@ -355,48 +355,6 @@ void __init init_IRQ(void) > #endif > } > > -int show_interrupts(struct seq_file *p, void *v) > -{ > - int i = *(loff_t *) v, cpu; > - struct irq_desc *desc; > - struct irqaction *action; > - unsigned long flags; > - > - if (i == 0) { > - char cpuname[12]; > - > - seq_printf(p, " "); > - for_each_present_cpu(cpu) { > - sprintf(cpuname, "CPU%d", cpu); > - seq_printf(p, " %10s", cpuname); > - } > - seq_putc(p, '\n'); > - } > - > - if (i < nr_irqs) { > - desc = irq_to_desc(i); > - raw_spin_lock_irqsave(&desc->lock, flags); > - action = desc->action; > - if (!action) > - goto unlock; > - > - seq_printf(p, "%3d: ", i); > - for_each_present_cpu(cpu) > - seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu)); > - seq_printf(p, " %10s", desc->irq_data.chip->name ? : "-"); > - seq_printf(p, " %s", action->name); > - for (action = action->next; action; action = action->next) > - seq_printf(p, ", %s", action->name); > - > - seq_putc(p, '\n'); > -unlock: > - raw_spin_unlock_irqrestore(&desc->lock, flags); > - } else if (i == nr_irqs) { > - seq_printf(p, "Error in interrupt!\n"); > - } > - return 0; > -} > - > /* > * do_IRQ handles all hardware IRQ's. Decoded IRQs should not > * come via this function. Instead, they should provide their ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [patch 0/2] unicore32: Final irq bits for .39 2011-03-25 14:26 [patch 0/2] unicore32: Final irq bits for .39 Thomas Gleixner 2011-03-25 14:26 ` [patch 1/2] unicore32: Convert to new irq function names Thomas Gleixner 2011-03-25 14:26 ` [patch 2/2] unicore32: Use generic show_interrupts() Thomas Gleixner @ 2011-03-29 14:09 ` Guan Xuetao 2 siblings, 0 replies; 6+ messages in thread From: Guan Xuetao @ 2011-03-29 14:09 UTC (permalink / raw) To: 'Thomas Gleixner', 'LKML' > -----Original Message----- > From: Thomas Gleixner [mailto:tglx@linutronix.de] > Sent: Friday, March 25, 2011 10:27 PM > To: LKML > Cc: Guan Xuetao > Subject: [patch 0/2] unicore32: Final irq bits for .39 > > Guan, > > the following series converts unicore to the new irq function names > and makes use of the generic show_interrupts() implementation. > > Can you please ack or send it to Linus yourself? > > Thanks, > > tglx Looks good to me. I have applied these patches in my branch. Thanks & Regards. Guan Xuetao ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-29 14:10 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-03-25 14:26 [patch 0/2] unicore32: Final irq bits for .39 Thomas Gleixner 2011-03-25 14:26 ` [patch 1/2] unicore32: Convert to new irq function names Thomas Gleixner 2011-03-29 14:09 ` Guan Xuetao 2011-03-25 14:26 ` [patch 2/2] unicore32: Use generic show_interrupts() Thomas Gleixner 2011-03-29 14:10 ` Guan Xuetao 2011-03-29 14:09 ` [patch 0/2] unicore32: Final irq bits for .39 Guan Xuetao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox