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

Commit 1d5cc604 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: remove mach .handle_irq for GIC users 



Now that the GIC initialization sets up the handle_arch_irq pointer, we
can remove it for all machines and make it static.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Anton Vorontsov <avorontsov@mvista.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent cfed7d60

arch/arm/common/gic.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int gic_set_wake(struct irq_data *d, unsigned int on) 
#define gic_set_wake	NULL

#endif



asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)

static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)

{

	u32 irqstat, irqnr;

	struct gic_chip_data *gic = &gic_data[0];

arch/arm/include/asm/hardware/gic.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *, 
		    u32 offset, struct device_node *);

int gic_of_init(struct device_node *node, struct device_node *parent);

void gic_secondary_init(unsigned int);

void gic_handle_irq(struct pt_regs *regs);

void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);



static inline void gic_init(unsigned int nr, int start,

arch/arm/kernel/smp_twd.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#include <asm/smp_twd.h>

#include <asm/localtimer.h>

#include <asm/hardware/gic.h>



/* set up by the platform code */

static void __iomem *twd_base;

arch/arm/mach-bcm/board_bcm.c

+0 −1
Original line number Diff line number Diff line
@@ -53,5 +53,4 @@ DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") 
	.timer = &timer,

	.init_machine = board_init,

	.dt_compat = bcm11351_dt_compat,

	.handle_irq = gic_handle_irq,

MACHINE_END

arch/arm/mach-cns3xxx/cns3420vb.c

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/usb/ohci_pdriver.h>

#include <asm/setup.h>

#include <asm/mach-types.h>

#include <asm/hardware/gic.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>
@@ -251,7 +250,6 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board") 
	.map_io		= cns3420_map_io,

	.init_irq	= cns3xxx_init_irq,

	.timer		= &cns3xxx_timer,

	.handle_irq	= gic_handle_irq,

	.init_machine	= cns3420_init,

	.restart	= cns3xxx_restart,

MACHINE_END