Skip to contentSkip to conversation

microblaze: Final irq bits for .39

PATCH In review Thomas Gleixner 2 participants 4 messages Mar 25, 2011 Microblaze architecture

lore
Share & tools
lore

Thomas Gleixner

author
#0 lore raw

cover microblaze: Final irq bits for .39

Michal,

the following patches convert to the new irq function names and make use of the generic show_interrupts().

Thanks,

tglx

author
#1 lore raw

PATCH 1/2 microblaze: Convert to new irq function names

Namespace conversion scripted with coccinelle.

Also retrieve the irq type from irq_data in intc_enable_or_unmask()

Signed-off-by Thomas Gleixner <[email protected]>
---
 arch/microblaze/kernel/intc.c    |    6 +++---
 arch/microblaze/pci/pci-common.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/microblaze/kernel/intc.c +3 -3
Index: linux-2.6-tip/arch/microblaze/kernel/intc.c
===================================================================
@@ -50,7 +50,7 @@ static void intc_enable_or_unmask(struct
 	 * ack function since the handle_level_irq function
 	 * acks the irq before calling the interrupt handler
 	 */
-	if (irq_to_desc(d->irq)->status & IRQ_LEVEL)
+	if (irqd_is_level_type(d))
 		out_be32(INTC_BASE + IAR, mask);
 }
 

@@ -157,11 +157,11 @@ void __init init_IRQ(void)
 
 	for (i = 0; i < nr_irq; ++i) {
 		if (intr_type & (0x00000001 << i)) {
-			set_irq_chip_and_handler_name(i, &intc_dev,
+			irq_set_chip_and_handler_name(i, &intc_dev,
 				handle_edge_irq, intc_dev.name);
 			irq_clear_status_flags(i, IRQ_LEVEL);
 		} else {
-			set_irq_chip_and_handler_name(i, &intc_dev,
+			irq_set_chip_and_handler_name(i, &intc_dev,
 				handle_level_irq, intc_dev.name);
 			irq_set_status_flags(i, IRQ_LEVEL);
 		}
arch/microblaze/pci/pci-common.c +1 -1
Index: linux-2.6-tip/arch/microblaze/pci/pci-common.c
===================================================================
@@ -237,7 +237,7 @@ int pci_read_irq_line(struct pci_dev *pc
 
 		virq = irq_create_mapping(NULL, line);
 		if (virq != NO_IRQ)
-			set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
+			irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
 	} else {
 		pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
 			 oirq.size, oirq.specifier[0], oirq.specifier[1],
author
#2 lore raw

PATCH 2/2 microblaze: Use generic show_interrupts()

In reply to Thomas Gleixner
Signed-off-by Thomas Gleixner <[email protected]>
---
 arch/microblaze/Kconfig      |    1 +
 arch/microblaze/kernel/irq.c |   42 ------------------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)
arch/microblaze/Kconfig +1 -0
Index: linux-2.6-tip/arch/microblaze/Kconfig
===================================================================
@@ -18,6 +18,7 @@ config MICROBLAZE
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_IRQ_PROBE
 	select GENERIC_HARDIRQS_NO_DEPRECATED
+	select GENERIC_IRQ_SHOW
 
 config SWAP
 	def_bool n
arch/microblaze/kernel/irq.c +0 -42

48 lines not on this page · raw message

maintainer
#3 lore raw
In reply to Thomas Gleixner

Hi Thomas,

Quoted 4 lines · Thomas Gleixner

Michal,

the following patches convert to the new irq function names and make use of the generic show_interrupts().

I will test them next week and let you know.

Thanks,
Michal

Signature · 4 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian