Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4adc192e authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
parent a749f8a5

arch/microblaze/kernel/intc.c

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void intc_enable_or_unmask(struct irq_data *d) 
	 * 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
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev) 


		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],