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

Commit de88cbb7 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm: Move chained_irq_(enter|exit) to a generic file 



These functions have been introduced by commit 10a8c383 (irq: introduce
entry and exit functions for chained handlers) in asm/mach/irq.h. This
patch moves them to linux/irqchip/chained_irq.h so that generic irqchip
drivers do not rely on architecture specific header files.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Tested-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Rob Herring <rob.herring@calxeda.com>
parent f36a3bb1

arch/arm/include/asm/mach/irq.h

+0 −31
Original line number Original line Diff line number Diff line
@@ -30,35 +30,4 @@ do { \ 
	raw_spin_unlock(&desc->lock);			\

	raw_spin_unlock(&desc->lock);			\

} while(0)

} while(0)





#ifndef __ASSEMBLY__

/*

 * Entry/exit functions for chained handlers where the primary IRQ chip

 * may implement either fasteoi or level-trigger flow control.

 */

static inline void chained_irq_enter(struct irq_chip *chip,

				     struct irq_desc *desc)

{

	/* FastEOI controllers require no action on entry. */

	if (chip->irq_eoi)

		return;



	if (chip->irq_mask_ack) {

		chip->irq_mask_ack(&desc->irq_data);

	} else {

		chip->irq_mask(&desc->irq_data);

		if (chip->irq_ack)

			chip->irq_ack(&desc->irq_data);

	}

}



static inline void chained_irq_exit(struct irq_chip *chip,

				    struct irq_desc *desc)

{

	if (chip->irq_eoi)

		chip->irq_eoi(&desc->irq_data);

	else

		chip->irq_unmask(&desc->irq_data);

}

#endif



#endif
 
#endif

arch/arm/mach-at91/gpio.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,10 +22,9 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/irqdomain.h>

#include <linux/irqdomain.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/of_address.h>

#include <linux/of_address.h>





#include <asm/mach/irq.h>



#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/at91_pio.h>

#include <mach/at91_pio.h>

arch/arm/mach-exynos/common.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/irqchip.h>

#include <linux/irqchip.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/irqchip/chained_irq.h>





#include <asm/proc-fns.h>

#include <asm/proc-fns.h>

#include <asm/exception.h>

#include <asm/exception.h>

arch/arm/mach-s3c24xx/irq.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/ioport.h>

#include <linux/ioport.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/irqdomain.h>

#include <linux/irqdomain.h>

#include <linux/irqchip/chained_irq.h>





#include <asm/mach/irq.h>

#include <asm/mach/irq.h>

arch/arm/plat-samsung/irq-vic-timer.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/io.h>

#include <linux/io.h>





#include <mach/map.h>

#include <mach/map.h>
@@ -23,8 +24,6 @@ 
#include <plat/irq-vic-timer.h>

#include <plat/irq-vic-timer.h>

#include <plat/regs-timer.h>

#include <plat/regs-timer.h>





#include <asm/mach/irq.h>



static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc)

static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc)

{

{

	struct irq_chip *chip = irq_get_chip(irq);

	struct irq_chip *chip = irq_get_chip(irq);