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

Commit 41a83e06 authored by Joel Porquet's avatar Joel Porquet Committed by Thomas Gleixner
Browse files

irqchip: Prepare for local stub header removal 



The IRQCHIP_DECLARE macro moved to to 'include/linux/irqchip.h', so
the local irqchip.h became an empty shell, which solely includes
include/linux/irqchip.h

Include the global header in all irqchip drivers instead of the local
header, so we can remove it.

Signed-off-by: default avatarJoel Porquet <joel@porquet.org>
Cc: vgupta@synopsys.com
Cc: monstr@monstr.eu
Cc: ralf@linux-mips.org
Cc: jason@lakedaemon.net
Link: http://lkml.kernel.org/r/1882096.X39jVG8e0D@joel-zenbook


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d452bca8

drivers/irqchip/exynos-combiner.c

+1 −2
Original line number Diff line number Diff line
@@ -15,13 +15,12 @@ 
#include <linux/slab.h>

#include <linux/syscore_ops.h>

#include <linux/irqdomain.h>

#include <linux/irqchip.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/interrupt.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>



#include "irqchip.h"



#define COMBINER_ENABLE_SET	0x0

#define COMBINER_ENABLE_CLEAR	0x4

#define COMBINER_INT_STATUS	0xC

drivers/irqchip/irq-armada-370-xp.c

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

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/irqchip.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/cpu.h>

#include <linux/io.h>
@@ -33,8 +34,6 @@ 
#include <asm/smp_plat.h>

#include <asm/mach/irq.h>



#include "irqchip.h"



/* Interrupt Controller Registers Map */

#define ARMADA_370_XP_INT_SET_MASK_OFFS		(0x48)

#define ARMADA_370_XP_INT_CLEAR_MASK_OFFS	(0x4C)

drivers/irqchip/irq-atmel-aic.c

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

#include <linux/types.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>
@@ -31,7 +32,6 @@ 
#include <asm/mach/irq.h>



#include "irq-atmel-aic-common.h"

#include "irqchip.h"



/* Number of irq lines managed by AIC */

#define NR_AIC_IRQS	32

drivers/irqchip/irq-atmel-aic5.c

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

#include <linux/types.h>

#include <linux/irq.h>

#include <linux/irqchip.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>
@@ -31,7 +32,6 @@ 
#include <asm/mach/irq.h>



#include "irq-atmel-aic-common.h"

#include "irqchip.h"



/* Number of irq lines managed by AIC */

#define NR_AIC5_IRQS	128

drivers/irqchip/irq-bcm2835.c

+1 −2
Original line number Diff line number Diff line
@@ -48,13 +48,12 @@ 
#include <linux/slab.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/irqchip.h>

#include <linux/irqdomain.h>



#include <asm/exception.h>

#include <asm/mach/irq.h>



#include "irqchip.h"



/* Put the bank and irq (32 bits) into the hwirq */

#define MAKE_HWIRQ(b, n)	((b << 5) | (n))

#define HWIRQ_BANK(i)		(i >> 5)