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

Commit a0368029 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: remove mach .handle_irq for VIC users 



Now that the VIC initialization sets up the handle_arch_irq pointer, we
can remove it for all machines and make it static. Move vic_handle_irq
to avoid a forward declaration.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Ryan Mallon <rmallon@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Hubert Feurstein <hubert.feurstein@contec.at>
Cc: Alessandro Rubini <rubini@unipv.it>
Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarJamie Iles <jamie@jamieiles.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 7fb7d8ae

arch/arm/common/vic.c

+36 −34
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ static struct vic_device vic_devices[CONFIG_ARM_VIC_NR]; 


static int vic_id;



static void vic_handle_irq(struct pt_regs *regs);



/**

 * vic_init2 - common initialisation code

 * @base: Base of the VIC.
@@ -199,6 +201,40 @@ static int vic_irqdomain_map(struct irq_domain *d, unsigned int irq, 
	return 0;

}



/*

 * Handle each interrupt in a single VIC.  Returns non-zero if we've

 * handled at least one interrupt.  This reads the status register

 * before handling each interrupt, which is necessary given that

 * handle_IRQ may briefly re-enable interrupts for soft IRQ handling.

 */

static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs)

{

	u32 stat, irq;

	int handled = 0;



	while ((stat = readl_relaxed(vic->base + VIC_IRQ_STATUS))) {

		irq = ffs(stat) - 1;

		handle_IRQ(irq_find_mapping(vic->domain, irq), regs);

		handled = 1;

	}



	return handled;

}



/*

 * Keep iterating over all registered VIC's until there are no pending

 * interrupts.

 */

static asmlinkage void __exception_irq_entry vic_handle_irq(struct pt_regs *regs)

{

	int i, handled;



	do {

		for (i = 0, handled = 0; i < vic_id; ++i)

			handled |= handle_one_vic(&vic_devices[i], regs);

	} while (handled);

}



static struct irq_domain_ops vic_irqdomain_ops = {

	.map = vic_irqdomain_map,

	.xlate = irq_domain_xlate_onetwocell,
@@ -446,37 +482,3 @@ int __init vic_of_init(struct device_node *node, struct device_node *parent) 
	return 0;

}

#endif /* CONFIG OF */
 


/*

 * Handle each interrupt in a single VIC.  Returns non-zero if we've

 * handled at least one interrupt.  This reads the status register

 * before handling each interrupt, which is necessary given that

 * handle_IRQ may briefly re-enable interrupts for soft IRQ handling.

 */

static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs)

{

	u32 stat, irq;

	int handled = 0;



	while ((stat = readl_relaxed(vic->base + VIC_IRQ_STATUS))) {

		irq = ffs(stat) - 1;

		handle_IRQ(irq_find_mapping(vic->domain, irq), regs);

		handled = 1;

	}



	return handled;

}



/*

 * Keep iterating over all registered VIC's until there are no pending

 * interrupts.

 */

asmlinkage void __exception_irq_entry vic_handle_irq(struct pt_regs *regs)

{

	int i, handled;



	do {

		for (i = 0, handled = 0; i < vic_id; ++i)

			handled |= handle_one_vic(&vic_devices[i], regs);

	} while (handled);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -33,6 +33,5 @@ void __vic_init(void __iomem *base, int irq_start, u32 vic_sources, 
		u32 resume_sources, struct device_node *node);

void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources, u32 resume_sources);

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

void vic_handle_irq(struct pt_regs *regs);



#endif

arch/arm/mach-ep93xx/adssphere.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ MACHINE_START(ADSSPHERE, "ADS Sphere board") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= adssphere_init_machine,

	.init_late	= ep93xx_init_late,

arch/arm/mach-ep93xx/edb93xx.c

+0 −8
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ MACHINE_START(EDB9301, "Cirrus Logic EDB9301 Evaluation Board") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb93xx_init_machine,

	.init_late	= ep93xx_init_late,
@@ -290,7 +289,6 @@ MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb93xx_init_machine,

	.init_late	= ep93xx_init_late,
@@ -304,7 +302,6 @@ MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb93xx_init_machine,

	.init_late	= ep93xx_init_late,
@@ -318,7 +315,6 @@ MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb93xx_init_machine,

	.init_late	= ep93xx_init_late,
@@ -332,7 +328,6 @@ MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb93xx_init_machine,

	.init_late	= ep93xx_init_late,
@@ -346,7 +341,6 @@ MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb93xx_init_machine,

	.init_late	= ep93xx_init_late,
@@ -360,7 +354,6 @@ MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb93xx_init_machine,

	.init_late	= ep93xx_init_late,
@@ -374,7 +367,6 @@ MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb93xx_init_machine,

	.init_late	= ep93xx_init_late,

arch/arm/mach-ep93xx/gesbc9312.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") 
	.atag_offset	= 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.handle_irq	= vic_handle_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= gesbc9312_init_machine,

	.init_late	= ep93xx_init_late,