Commit-ID: e81a7cd96bd55bb57d92486c514b7b8f8c8cd8ce Gitweb: http://git.kernel.org/tip/e81a7cd96bd55bb57d92486c514b7b8f8c8cd8ce Author: Marc Zyngier <marc.zyng...@arm.com> AuthorDate: Tue, 13 Oct 2015 12:51:39 +0100 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Tue, 13 Oct 2015 19:01:24 +0200
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.zyng...@arm.com> Reviewed-and-tested-by: Hanjun Guo <hanjun....@linaro.org> Tested-by: Lorenzo Pieralisi <lorenzo.pieral...@arm.com> Cc: <linux-arm-ker...@lists.infradead.org> Cc: Tomasz Nowicki <tomasz.nowi...@linaro.org> Cc: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com> Cc: Graeme Gregory <gra...@xora.org.uk> Cc: Jake Oshins <ja...@microsoft.com> Cc: Jiang Liu <jiang....@linux.intel.com> Cc: Jason Cooper <ja...@lakedaemon.net> Cc: Rafael J. Wysocki <r...@rjwysocki.net> Link: http://lkml.kernel.org/r/1444737105-31573-12-git-send-email-marc.zyng...@arm.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- drivers/irqchip/irq-gic.c | 8 +++----- include/linux/irqchip/arm-gic.h | 9 ++------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 9262bb9..12b2973 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1127,17 +1127,15 @@ static void __init __gic_init_bases(unsigned int gic_nr, int irq_start, gic_pm_init(gic); } -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) +void __init gic_init(unsigned int gic_nr, int irq_start, + void __iomem *dist_base, void __iomem *cpu_base) { /* * Non-DT/ACPI systems won't run a hypervisor, so let's not * bother with these... */ static_key_slow_dec(&supports_deactivate); - __gic_init_bases(gic_nr, irq_start, dist_base, cpu_base, - percpu_offset, node); + __gic_init_bases(gic_nr, irq_start, dist_base, cpu_base, 0, NULL); } #ifdef CONFIG_OF diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index b8901df..bae69e5 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -100,16 +100,11 @@ 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); int gic_cpu_if_down(unsigned int gic_nr); -static inline void gic_init(unsigned int nr, int start, - void __iomem *dist , void __iomem *cpu) -{ - gic_init_bases(nr, start, dist, cpu, 0, NULL); -} +void gic_init(unsigned int nr, int start, + void __iomem *dist , void __iomem *cpu); int gicv2m_of_init(struct device_node *node, struct irq_domain *parent); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/