[patch 1/2] tile: Convert to new irq function names

[patch 1/2] tile: Convert to new irq function names

[Thomas Gleixner]

[-- Attachment #1: tile-namespace.patch --]
[-- Type: text/plain, Size: 1353 bytes --]

Converted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Chris Metcalf <cmetcalf@tilera.com>
---
 arch/tile/kernel/irq.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-tip/arch/tile/kernel/irq.c
===================================================================
--- linux-2.6-tip.orig/arch/tile/kernel/irq.c
+++ linux-2.6-tip/arch/tile/kernel/irq.c
@@ -241,14 +241,14 @@ void tile_irq_activate(unsigned int irq,
 	irq_flow_handler_t handle = handle_level_irq;
 	if (tile_irq_type == TILE_IRQ_PERCPU)
 		handle = handle_percpu_irq;
-	set_irq_chip_and_handler(irq, &tile_irq_chip, handle);
+	irq_set_chip_and_handler(irq, &tile_irq_chip, handle);
 
 	/*
 	 * Flag interrupts that are hardware-cleared so that ack()
 	 * won't clear them.
 	 */
 	if (tile_irq_type == TILE_IRQ_HW_CLEAR)
-		set_irq_chip_data(irq, (void *)IS_HW_CLEARED);
+		irq_set_chip_data(irq, (void *)IS_HW_CLEARED);
 }
 EXPORT_SYMBOL(tile_irq_activate);
 
@@ -290,7 +290,7 @@ int show_interrupts(struct seq_file *p, 
 		for_each_online_cpu(j)
 			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
 #endif
-		seq_printf(p, " %14s", get_irq_desc_chip(desc)->name);
+		seq_printf(p, " %14s", irq_desc_get_chip(desc)->name);
 		seq_printf(p, "  %s", action->name);
 
 		for (action = action->next; action; action = action->next)

[patch 0/2] tile: Final irq bits for .39

[Thomas Gleixner]

Chris,

the series converts the irq functions to the new function names and
makes use of the generic show_interrupts() implementation.

Can you please ack or send it to Linus yourself ?

Thanks,

	tglx

[patch 2/2] tile: Use generic show_interupts()

[Thomas Gleixner]

[-- Attachment #1: tile-use-show.patch --]
[-- Type: text/plain, Size: 1999 bytes --]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Chris Metcalf <cmetcalf@tilera.com>
---
 arch/tile/Kconfig      |    1 +
 arch/tile/kernel/irq.c |   41 -----------------------------------------
 2 files changed, 1 insertion(+), 41 deletions(-)

Index: linux-2.6-tip/arch/tile/Kconfig
===================================================================
--- linux-2.6-tip.orig/arch/tile/Kconfig
+++ linux-2.6-tip/arch/tile/Kconfig
@@ -12,6 +12,7 @@ config TILE
 	select GENERIC_IRQ_PROBE
 	select GENERIC_PENDING_IRQ if SMP
 	select GENERIC_HARDIRQS_NO_DEPRECATED
+	select GENERIC_IRQ_SHOW
 
 # FIXME: investigate whether we need/want these options.
 #	select HAVE_IOREMAP_PROT
Index: linux-2.6-tip/arch/tile/kernel/irq.c
===================================================================
--- linux-2.6-tip.orig/arch/tile/kernel/irq.c
+++ linux-2.6-tip/arch/tile/kernel/irq.c
@@ -262,47 +262,6 @@ void ack_bad_irq(unsigned int irq)
  * Generic, controller-independent functions:
  */
 
-int show_interrupts(struct seq_file *p, void *v)
-{
-	int i = *(loff_t *) v, j;
-	struct irqaction *action;
-	unsigned long flags;
-
-	if (i == 0) {
-		seq_printf(p, "           ");
-		for (j = 0; j < NR_CPUS; j++)
-			if (cpu_online(j))
-				seq_printf(p, "CPU%-8d", j);
-		seq_putc(p, '\n');
-	}
-
-	if (i < NR_IRQS) {
-		struct irq_desc *desc = irq_to_desc(i);
-
-		raw_spin_lock_irqsave(&desc->lock, flags);
-		action = desc->action;
-		if (!action)
-			goto skip;
-		seq_printf(p, "%3d: ", i);
-#ifndef CONFIG_SMP
-		seq_printf(p, "%10u ", kstat_irqs(i));
-#else
-		for_each_online_cpu(j)
-			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
-#endif
-		seq_printf(p, " %14s", irq_desc_get_chip(desc)->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');
-skip:
-		raw_spin_unlock_irqrestore(&desc->lock, flags);
-	}
-	return 0;
-}
-
 #if CHIP_HAS_IPI()
 int create_irq(void)
 {

Re: [patch 0/2] tile: Final irq bits for .39

[Chris Metcalf]

On 3/25/2011 10:21 AM, Thomas Gleixner wrote:
> Chris,
>
> the series converts the irq functions to the new function names and
> makes use of the generic show_interrupts() implementation.
>
> Can you please ack or send it to Linus yourself ?

Acked-by: Chris Metcalf <cmetcalf@tilera.com>

I'd probably prefer you send it, but if you'd like me to, let me know.  I
confirmed that I can build and boot with your change, and that
/proc/interrupts produces something reasonable.

Well, no less reasonable than usual for our chip, anyway; this is for a
chip on a PCIe board, so no PCI or other interrupt sources plugged in:

# cat /proc/interrupts
           CPU0       CPU1       CPU2       CPU3       CPU4       CPU5       CPU6       CPU7       CPU8       CPU9       CPU10      CPU11      CPU12      CPU13      CPU14      CPU15      CPU16      CPU17      CPU18      CPU19      CPU20      CPU21      CPU22      CPU23      CPU24      CPU25      CPU26      CPU27      CPU28      CPU29      CPU30      CPU31      CPU32      CPU33      CPU34      CPU35      CPU36      CPU37      CPU38      CPU39      CPU40      CPU41      CPU42      CPU43      CPU44      CPU45      CPU46      CPU47      CPU48      CPU49      CPU50      CPU51      CPU52      CPU53      CPU54      CPU55      CPU58
  1:        479        313          8          3          3          3          3          3          3          3          4          4          4          4          4          4         10          4          4          4          4          4          4          4          4          4          3         39         84         35          9          5          5          3          3          3          3          3          3          3          3          9          3          4          4          4          4         10          4          4        109          4          4          4          4          4        134  tile_irq_chip  resched


-- 
Chris Metcalf, Tilera Corp.
http://www.tilera.com

Re: [patch 0/2] tile: Final irq bits for .39

[Thomas Gleixner]

On Fri, 25 Mar 2011, Chris Metcalf wrote:

> On 3/25/2011 10:21 AM, Thomas Gleixner wrote:
> > Chris,
> >
> > the series converts the irq functions to the new function names and
> > makes use of the generic show_interrupts() implementation.
> >
> > Can you please ack or send it to Linus yourself ?
> 
> Acked-by: Chris Metcalf <cmetcalf@tilera.com>
> 
> I'd probably prefer you send it, but if you'd like me to, let me know.  I

I send it.

Thanks,

	tglx