Skip to contentSkip to conversation

score: Convert irq_chip to new functions

PATCH In review Thomas Gleixner 2 participants 6 messages Feb 6, 2011 – Feb 11, 2011

lore
Share & tools
lore
#0 lore raw

cover score: Convert irq_chip to new functions

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

#1 lore raw

PATCH 1/2 score: Convert irq_chip to new functions

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

---
 arch/score/kernel/irq.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
arch/score/kernel/irq.c +13 -11
Index: 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;
#2 lore raw

PATCH 2/2 score: Select GENERIC_HARDIRQS_NO_DEPRECATED

In reply to Thomas Gleixner

All chips converted and proper accessor functions used.

---
 arch/score/Kconfig |    1 +
 1 file changed, 1 insertion(+)
arch/score/Kconfig +1 -0
Index: 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 on v1 2/2
#3 lore raw

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

Thomas Gleixner <[email protected]> 写于 2011-02-07 06:23:50:

Quoted 14 lines

All chips converted and proper accessor functions used.

---
 arch/score/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Index: linux-next/arch/score/Kconfig
===================================================================

arch/score/Kconfig menu "Machine selection" · line 9

Quoted 7 lines
arch/score/Kconfig +1 -0
@@ -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"

--

�翳簕.n�+壏煯壄�+%娝�遍荻w�簕.n�+壏{炳G珴�妠ay�蕠跈�,jf"穐殢飦�戧鐉_璁(殠娸"濟�m���G珴�⒏?櫒璀�&x忈秈O曟瑉窔v豝�m��� �鹅�⒏?朓�

#4 lore raw

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

Quoted 19 lines · On Thu, 10 Feb 2011, [email protected] wrote:

Thomas Gleixner <[email protected]> 写于 2011-02-07 06:23:50:

Quoted 17 lines

All chips converted and proper accessor functions used.

---
 arch/score/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Index: linux-next/arch/score/Kconfig
===================================================================

arch/score/Kconfig +1 -0
@@ -3,6 +3,7 @@ menu "Machine selection"
 config SCORE
        def_bool y
        select HAVE_GENERIC_HARDIRQS
+       select GENERIC_HARDIRQS_NO_DEPRECATED
 
Quoted 6 lines

arch/score/Kconfig menu "Machine selection" · line 9

Quoted 4 lines
arch/score/Kconfig +0 -0
 choice
    prompt "System type"

Can you take that through your tree for .39 ?

Thanks,

tglx

#5 lore raw

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

Thomas Gleixner <[email protected]> 写于 2011-02-11 06:56:41:

Quoted 4 lines · On Thu, 10 Feb 2011, [email protected] wrote:

Can you take that through your tree for .39 ?

OK, I will check in.

Thanks
--liqin

�翳簕.n�+壏煯壄�+%娝�遍荻w�簕.n�+壏{炳G珴�妠ay�蕠跈�,jf"穐殢飦�戧鐉_璁(殠娸"濟�m���G珴�⒏?櫒璀�&x忈秈O曟瑉窔v豝�m��� �鹅�⒏?朓�