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

Commit e81a7cd9 authored Oct 13, 2015 by Marc Zyngier Committed by Thomas Gleixner Oct 13, 2015

irqchip/gic: Get rid of gic_init_bases()



Since nobody is using gic_init_bases anymore outside of the GIC
driver itself, let's do a bit of housekeeping and remove the now
useless entry point.

Only gic_init() is now exposed to the rest of the kernel for the
benefit of legacy systems.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-and-tested-by: Hanjun Guo <hanjun.guo@linaro.org>
Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Graeme Gregory <graeme@xora.org.uk>
Cc: Jake Oshins <jakeo@microsoft.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Link: http://lkml.kernel.org/r/1444737105-31573-12-git-send-email-marc.zyngier@arm.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 2bc6eba4

drivers/irqchip/irq-gic.c

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1127,17 +1127,15 @@ static void __init __gic_init_bases(unsigned int gic_nr, int irq_start,
	gic_pm_init(gic);		gic_pm_init(gic);
	}		}

	void __init gic_init_bases(unsigned int gic_nr, int irq_start,		void __init gic_init(unsigned int gic_nr, int irq_start,
	void __iomem dist_base, void __iomem cpu_base,		void __iomem dist_base, void __iomem cpu_base)
	u32 percpu_offset, struct device_node *node)
	{		{
	/*		/*
	* Non-DT/ACPI systems won't run a hypervisor, so let's not		* Non-DT/ACPI systems won't run a hypervisor, so let's not
	* bother with these...		* bother with these...
	*/		*/
	static_key_slow_dec(&supports_deactivate);		static_key_slow_dec(&supports_deactivate);
	__gic_init_bases(gic_nr, irq_start, dist_base, cpu_base,		__gic_init_bases(gic_nr, irq_start, dist_base, cpu_base, 0, NULL);
	percpu_offset, node);
	}		}

	#ifdef CONFIG_OF		#ifdef CONFIG_OF

include/linux/irqchip/arm-gic.h

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -100,16 +100,11 @@

	struct device_node;		struct device_node;

	void gic_init_bases(unsigned int, int, void __iomem , void __iomem ,
	u32 offset, struct device_node *);
	void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);		void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);
	int gic_cpu_if_down(unsigned int gic_nr);		int gic_cpu_if_down(unsigned int gic_nr);

	static inline void gic_init(unsigned int nr, int start,		void gic_init(unsigned int nr, int start,
	void __iomem dist , void __iomem cpu)		void __iomem dist , void __iomem cpu);
	{
	gic_init_bases(nr, start, dist, cpu, 0, NULL);
	}

	int gicv2m_of_init(struct device_node node, struct irq_domain parent);		int gicv2m_of_init(struct device_node node, struct irq_domain parent);