From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932634AbbJMR6o (ORCPT ); Tue, 13 Oct 2015 13:58:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43148 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753454AbbJMR6l (ORCPT ); Tue, 13 Oct 2015 13:58:41 -0400 Date: Tue, 13 Oct 2015 10:58:02 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: tglx@linutronix.de, tomasz.nowicki@linaro.org, lorenzo.pieralisi@arm.com, linux-arm-kernel@lists.infradead.org, jiang.liu@linux.intel.com, linux-kernel@vger.kernel.org, graeme@xora.org.uk, mingo@kernel.org, Suravee.Suthikulpanit@amd.com, marc.zyngier@arm.com, rjw@rjwysocki.net, jakeo@microsoft.com, hpa@zytor.com, jason@lakedaemon.net, hanjun.guo@linaro.org Reply-To: linux-kernel@vger.kernel.org, marc.zyngier@arm.com, Suravee.Suthikulpanit@amd.com, mingo@kernel.org, graeme@xora.org.uk, hpa@zytor.com, jason@lakedaemon.net, jakeo@microsoft.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, tglx@linutronix.de, tomasz.nowicki@linaro.org, lorenzo.pieralisi@arm.com, jiang.liu@linux.intel.com, linux-arm-kernel@lists.infradead.org In-Reply-To: <1444737105-31573-12-git-send-email-marc.zyngier@arm.com> References: <1444737105-31573-12-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/gic: Get rid of gic_init_bases() Git-Commit-ID: e81a7cd96bd55bb57d92486c514b7b8f8c8cd8ce X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e81a7cd96bd55bb57d92486c514b7b8f8c8cd8ce Gitweb: http://git.kernel.org/tip/e81a7cd96bd55bb57d92486c514b7b8f8c8cd8ce Author: Marc Zyngier AuthorDate: Tue, 13 Oct 2015 12:51:39 +0100 Committer: Thomas Gleixner 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 Reviewed-and-tested-by: Hanjun Guo Tested-by: Lorenzo Pieralisi Cc: Cc: Tomasz Nowicki Cc: Suravee Suthikulpanit Cc: Graeme Gregory Cc: Jake Oshins Cc: Jiang Liu Cc: Jason Cooper Cc: Rafael J. Wysocki Link: http://lkml.kernel.org/r/1444737105-31573-12-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- 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);