From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932813AbbJMR71 (ORCPT ); Tue, 13 Oct 2015 13:59:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43190 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932310AbbJMR7X (ORCPT ); Tue, 13 Oct 2015 13:59:23 -0400 Date: Tue, 13 Oct 2015 10:58:46 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: linux-arm-kernel@lists.infradead.org, mingo@kernel.org, Suravee.Suthikulpanit@amd.com, hpa@zytor.com, graeme@xora.org.uk, marc.zyngier@arm.com, lorenzo.pieralisi@arm.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jiang.liu@linux.intel.com, hanjun.guo@linaro.org, tomasz.nowicki@linaro.org, jakeo@microsoft.com, jason@lakedaemon.net, rjw@rjwysocki.net Reply-To: linux-arm-kernel@lists.infradead.org, hpa@zytor.com, Suravee.Suthikulpanit@amd.com, mingo@kernel.org, hanjun.guo@linaro.org, jiang.liu@linux.intel.com, linux-kernel@vger.kernel.org, graeme@xora.org.uk, marc.zyngier@arm.com, lorenzo.pieralisi@arm.com, tglx@linutronix.de, rjw@rjwysocki.net, jason@lakedaemon.net, jakeo@microsoft.com, tomasz.nowicki@linaro.org In-Reply-To: <1444737105-31573-14-git-send-email-marc.zyngier@arm.com> References: <1444737105-31573-14-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/gic: Kill the xlate method Git-Commit-ID: 18bd8847cdd4dac3276ae9973739c570ce37e0b7 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: 18bd8847cdd4dac3276ae9973739c570ce37e0b7 Gitweb: http://git.kernel.org/tip/18bd8847cdd4dac3276ae9973739c570ce37e0b7 Author: Marc Zyngier AuthorDate: Tue, 13 Oct 2015 12:51:41 +0100 Committer: Thomas Gleixner CommitDate: Tue, 13 Oct 2015 19:01:25 +0200 irqchip/gic: Kill the xlate method We are now left with only two use models for the GIC driver: - Via a firmware interface, which mandates a hierarchical domain, and the use of the 'translate' method - The legacy platforms, which assume irq==hwirq, hence not using the 'xlate' method. The logical conclusion is that we can now nuke the 'xlate' method altogether. 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-14-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-gic.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 491eacb..1d0e768 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -916,30 +916,6 @@ static void gic_irq_domain_unmap(struct irq_domain *d, unsigned int irq) { } -static int gic_irq_domain_xlate(struct irq_domain *d, - struct device_node *controller, - const u32 *intspec, unsigned int intsize, - unsigned long *out_hwirq, unsigned int *out_type) -{ - unsigned long ret = 0; - - if (irq_domain_get_of_node(d) != controller) - return -EINVAL; - if (intsize < 3) - return -EINVAL; - - /* Get the interrupt number and add 16 to skip over SGIs */ - *out_hwirq = intspec[1] + 16; - - /* For SPIs, we need to add 16 more to get the GIC irq ID number */ - if (!intspec[0]) - *out_hwirq += 16; - - *out_type = intspec[2] & IRQ_TYPE_SENSE_MASK; - - return ret; -} - static int gic_irq_domain_translate(struct irq_domain *d, struct irq_fwspec *fwspec, unsigned long *hwirq, @@ -1021,7 +997,6 @@ static const struct irq_domain_ops gic_irq_domain_hierarchy_ops = { static const struct irq_domain_ops gic_irq_domain_ops = { .map = gic_irq_domain_map, .unmap = gic_irq_domain_unmap, - .xlate = gic_irq_domain_xlate, }; static void __init __gic_init_bases(unsigned int gic_nr, int irq_start,