[patch 0/2] score: Convert irq_chip to new functions

[patch 0/2] score: Convert irq_chip to new functions

[Thomas Gleixner]

This series converts the irq_chip in arch/score to the new callback
functions and uses the proper accessor functions in show_interrupts().
Finally it sets GENERIC_HARDIRQS_NO_DEPRECATED

Thanks,

	tglx

[patch 1/2] score: Convert irq_chip to new functions

[Thomas Gleixner]

[-- Attachment #1: score-convert-irq-chip.patch --]
[-- Type: text/plain, Size: 2242 bytes --]

Use the proper accessor functions in show_interrupts() while at it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/score/kernel/irq.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

Index: linux-next/arch/score/kernel/irq.c
===================================================================
--- linux-next.orig/arch/score/kernel/irq.c
+++ linux-next/arch/score/kernel/irq.c
@@ -52,9 +52,9 @@ asmlinkage void do_IRQ(int irq)
 	irq_exit();
 }
 
-static void score_mask(unsigned int irq_nr)
+static void score_mask(struct irq_data *d)
 {
-	unsigned int irq_source = 63 - irq_nr;
+	unsigned int irq_source = 63 - d->irq;
 
 	if (irq_source < 32)
 		__raw_writel((__raw_readl(SCORE_PIC + INT_MASKL) | \
@@ -64,9 +64,9 @@ static void score_mask(unsigned int irq_
 			(1 << (irq_source - 32))), SCORE_PIC + INT_MASKH);
 }
 
-static void score_unmask(unsigned int irq_nr)
+static void score_unmask(struct irq_data *d)
 {
-	unsigned int irq_source = 63 - irq_nr;
+	unsigned int irq_source = 63 - d->irq;
 
 	if (irq_source < 32)
 		__raw_writel((__raw_readl(SCORE_PIC + INT_MASKL) & \
@@ -78,9 +78,9 @@ static void score_unmask(unsigned int ir
 
 struct irq_chip score_irq_chip = {
 	.name		= "Score7-level",
-	.mask		= score_mask,
-	.mask_ack	= score_mask,
-	.unmask		= score_unmask,
+	.irq_mask	= score_mask,
+	.irq_mask_ack	= score_mask,
+	.irq_unmask	= score_unmask,
 };
 
 /*
@@ -127,21 +127,23 @@ int show_interrupts(struct seq_file *p, 
 	}
 
 	if (i < NR_IRQS) {
-		spin_lock_irqsave(&irq_desc[i].lock, flags);
-		action = irq_desc[i].action;
+		struct irq_desc *desc = irq_to_desc(i);
+
+		raw_spin_lock_irqsave(&desc->lock, flags);
+		action = desc->action;
 		if (!action)
 			goto unlock;
 
 		seq_printf(p, "%3d: ", i);
 		seq_printf(p, "%10u ", kstat_irqs(i));
-		seq_printf(p, " %8s", irq_desc[i].chip->name ? : "-");
+		seq_printf(p, " %8s", get_irq_desc_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');
 unlock:
-		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+		raw_spin_unlock_irqrestore(&desc->lock, flags);
 	}
 
 	return 0;

[patch 2/2] score: Select GENERIC_HARDIRQS_NO_DEPRECATED

[Thomas Gleixner]

[-- Attachment #1: score-set-nodepr.patch --]
[-- Type: text/plain, Size: 545 bytes --]

All chips converted and proper accessor functions used.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/score/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Index: linux-next/arch/score/Kconfig
===================================================================
--- linux-next.orig/arch/score/Kconfig
+++ linux-next/arch/score/Kconfig
@@ -3,6 +3,7 @@ menu "Machine selection"
 config SCORE
        def_bool y
        select HAVE_GENERIC_HARDIRQS
+       select GENERIC_HARDIRQS_NO_DEPRECATED
 
 choice
 	prompt "System type"

Re: [patch 2/2] score: Select GENERIC_HARDIRQS_NO_DEPRECATED

[liqin.chen]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="GB2312", Size: 865 bytes --]

Thomas Gleixner <tglx@linutronix.de> дÓÚ 2011-02-07 06:23:50:

> All chips converted and proper accessor functions used.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
>  arch/score/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> Index: linux-next/arch/score/Kconfig
> ===================================================================
> --- linux-next.orig/arch/score/Kconfig
> +++ linux-next/arch/score/Kconfig
> @@ -3,6 +3,7 @@ menu "Machine selection"
>  config SCORE
>         def_bool y
>         select HAVE_GENERIC_HARDIRQS
> +       select GENERIC_HARDIRQS_NO_DEPRECATED
> 
>  choice
>     prompt "System type"
> 
> 

Acked-by: Chen Liqin <liqin.chen@sunplusct.com>
--

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [patch 2/2] score: Select GENERIC_HARDIRQS_NO_DEPRECATED

[Thomas Gleixner]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 867 bytes --]

On Thu, 10 Feb 2011, liqin.chen@sunplusct.com wrote:

> Thomas Gleixner <tglx@linutronix.de> 写于 2011-02-07 06:23:50:
> 
> > All chips converted and proper accessor functions used.
> > 
> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> > ---
> >  arch/score/Kconfig |    1 +
> >  1 file changed, 1 insertion(+)
> > 
> > Index: linux-next/arch/score/Kconfig
> > ===================================================================
> > --- linux-next.orig/arch/score/Kconfig
> > +++ linux-next/arch/score/Kconfig
> > @@ -3,6 +3,7 @@ menu "Machine selection"
> >  config SCORE
> >         def_bool y
> >         select HAVE_GENERIC_HARDIRQS
> > +       select GENERIC_HARDIRQS_NO_DEPRECATED
> > 
> >  choice
> >     prompt "System type"
> > 
> > 
> 
> Acked-by: Chen Liqin <liqin.chen@sunplusct.com>

Can you take that through your tree for .39 ?

Thanks,

	tglx

Re: [patch 2/2] score: Select GENERIC_HARDIRQS_NO_DEPRECATED

[liqin.chen]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="GB2312", Size: 372 bytes --]

Thomas Gleixner <tglx@linutronix.de> дÓÚ 2011-02-11 06:56:41:

> On Thu, 10 Feb 2011, liqin.chen@sunplusct.com wrote:
> 
> Can you take that through your tree for .39 ?
> 

OK, I will check in.

Thanks
--liqin

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥