Commit 0d3f2c92 authored by Sudeep Holla's avatar Sudeep Holla Committed by Thomas Gleixner
Browse files

irqchip/gic: Remove redundant gic_set_irqchip_flags 



Now that the GIC chip implementation enables IRQCHIP_SKIP_SET_WAKE and
IRQCHIP_MASK_ON_SUSPEND by default, the platforms requiring them need
not override the irqchip flags as before.

This patch removes all the users of gic_set_irqchip_flags and the
function itself.

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1436971109-20189-2-git-send-email-sudeep.holla@arm.com


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

arch/arm/mach-shmobile/intc-sh73a0.c

+0 −1
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ void __init sh73a0_init_irq(void) 
	void __iomem *gic_cpu_base = IOMEM(0xf0000100);

	void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE);



	gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE);

	gic_init(0, 29, gic_dist_base, gic_cpu_base);



	register_intc_controller(&intcs_desc);

arch/arm/mach-shmobile/setup-r8a7779.c

+0 −1
Original line number Diff line number Diff line
@@ -719,7 +719,6 @@ void __init r8a7779_init_irq_dt(void) 
	void __iomem *gic_dist_base = ioremap_nocache(0xf0001000, 0x1000);

	void __iomem *gic_cpu_base = ioremap_nocache(0xf0000100, 0x1000);

#endif

	gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE);



#ifdef CONFIG_ARCH_SHMOBILE_LEGACY

	gic_init(0, 29, gic_dist_base, gic_cpu_base);

arch/arm/mach-ux500/cpu.c

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ void __init ux500_init_irq(void) 
	struct device_node *np;

	struct resource r;



	gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND);

	irqchip_init();

	np = of_find_compatible_node(NULL, NULL, "stericsson,db8500-prcmu");

	of_address_to_resource(np, 0, &r);

arch/arm/mach-zynq/common.c

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ static void __init zynq_map_io(void) 


static void __init zynq_irq_init(void)

{

	gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND);

	irqchip_init();

}

drivers/irqchip/irq-gic.c

+0 −5
Original line number Diff line number Diff line
@@ -881,11 +881,6 @@ static const struct irq_domain_ops gic_irq_domain_ops = { 
	.xlate = gic_irq_domain_xlate,

};



void gic_set_irqchip_flags(unsigned long flags)

{

	gic_chip.flags |= flags;

}



void __init gic_init_bases(unsigned int gic_nr, int irq_start,

			   void __iomem *dist_base, void __iomem *cpu_base,

			   u32 percpu_offset, struct device_node *node)

CRA Git | Maintained and supported by SUSTech CRA and CCSE