Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1240799

[PATCH 13/16] irqchip/gic: Kill the xlate method

Show all headers | View raw

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 <marc.zyngier@arm.com>
---
 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 ad5ecfd..a4bd77f 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -903,30 +903,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,
@@ -1008,7 +984,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,
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/16] Divorcing irqdomain and device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
  [PATCH 12/16] irqchip/gic: Switch ACPI support to stacked domains Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
  [PATCH 13/16] irqchip/gic: Kill the xlate method Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
  [PATCH 08/16] irqdomain: Add a fwnode_handle allocator Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
    Re: [PATCH 08/16] irqdomain: Add a fwnode_handle allocator "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-10-12 22:10 +0200
  [PATCH 07/16] irqdomain: Introduce irq_domain_create_{linear,tree} Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:40 +0200
  [PATCH 03/16] irqdomain: Allow irq domain lookup by fwnode Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
    Re: [PATCH 03/16] irqdomain: Allow irq domain lookup by fwnode Marc Zyngier <marc.zyngier@arm.com> - 2015-10-13 09:40 +0200
  [PATCH 05/16] irqchip: Convert all alloc/xlate users from of_node to fwnode Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
    Re: [PATCH 05/16] irqchip: Convert all alloc/xlate users from of_node  to fwnode Hanjun Guo <hanjun.guo@linaro.org> - 2015-10-12 08:50 +0200
  [PATCH 06/16] irqdomain: Introduce irq_create_fwspec_mapping Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
  [PATCH 01/16] irqdomain: Use an accessor for the of_node field Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
    Re: [PATCH 01/16] irqdomain: Use an accessor for the of_node field Thomas Gleixner <tglx@linutronix.de> - 2015-10-09 16:30 +0200
      Re: [PATCH 01/16] irqdomain: Use an accessor for the of_node field Marc Zyngier <marc.zyngier@arm.com> - 2015-10-09 16:40 +0200
    Re: [PATCH 01/16] irqdomain: Use an accessor for the of_node field Hanjun Guo <hanjun.guo@linaro.org> - 2015-10-12 08:10 +0200
      Re: [PATCH 01/16] irqdomain: Use an accessor for the of_node field Marc Zyngier <marc.zyngier@arm.com> - 2015-10-12 11:40 +0200
  [PATCH 04/16] irqdomain: Introduce a firmware-specific IRQ specifier structure Marc Zyngier <marc.zyngier@arm.com> - 2015-10-06 19:50 +0200
  Re: [PATCH 00/16] Divorcing irqdomain and device_node Thomas Gleixner <tglx@linutronix.de> - 2015-10-11 23:10 +0200
    Re: [PATCH 00/16] Divorcing irqdomain and device_node Hanjun Guo <hanjun.guo@linaro.org> - 2015-10-12 04:50 +0200
      Re: [PATCH 00/16] Divorcing irqdomain and device_node Hanjun Guo <hanjun.guo@linaro.org> - 2015-10-12 09:20 +0200
    Re: [PATCH 00/16] Divorcing irqdomain and device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-10-12 12:40 +0200
    Re: [PATCH 00/16] Divorcing irqdomain and device_node "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-10-12 22:20 +0200
      Re: [PATCH 00/16] Divorcing irqdomain and device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-10-13 10:30 +0200

csiph-web