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

Groups > linux.kernel > #1224339

[PATCH v3 8/8] acpi: gsi: Cleanup acpi_register_gsi

Show all headers | View raw

As the only user of drivers/acpi/gsi.c is now using acpi_set_irq_model
to set acpi_gsi_descriptor_populate to something meaningful, we can
always rely on that information to be present (its absence is an error),
and guarantee that new interrupt controllers will use this API.

Take this opportunity to cleanup acpi_register_gsi.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 drivers/acpi/gsi.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/drivers/acpi/gsi.c b/drivers/acpi/gsi.c
index 07f5fef5..2dde6a1 100644
--- a/drivers/acpi/gsi.c
+++ b/drivers/acpi/gsi.c
@@ -75,28 +75,20 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
 		      int polarity)
 {
 	int err;
-	unsigned int irq;
+	struct acpi_gsi_descriptor data;
 	unsigned int irq_type = acpi_gsi_get_irq_type(trigger, polarity);
 	struct irq_domain *d = irq_find_host(acpi_gsi_domain_token);
 
-	if (acpi_gsi_descriptor_populate) {
-		struct acpi_gsi_descriptor data;
-		err = acpi_gsi_descriptor_populate(&data, gsi, irq_type);
-		if (err)
-			return err;
-
-		return irq_create_acpi_mapping(d, &data);
+	if (WARN_ON(!acpi_gsi_descriptor_populate)) {
+		pr_warn("GSI: No registered irqchip, giving up\n");
+		return -EINVAL;
 	}
 
-	irq = irq_create_mapping(d, gsi);
-	if (!irq)
-		return -EINVAL;
+	err = acpi_gsi_descriptor_populate(&data, gsi, irq_type);
+	if (err)
+		return err;
 
-	/* Set irq type if specified and different than the current one */
-	if (irq_type != IRQ_TYPE_NONE &&
-		irq_type != irq_get_trigger_type(irq))
-		irq_set_irq_type(irq, irq_type);
-	return irq;
+	return irq_create_acpi_mapping(d, &data);
 }
 EXPORT_SYMBOL_GPL(acpi_register_gsi);
 
-- 
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 v3 0/8] Making the generic ACPI GSI layer irqdomain aware Marc Zyngier <marc.zyngier@arm.com> - 2015-09-14 18:50 +0200
  [PATCH v3 5/8] acpi: gsi: Always perform an irq domain lookup Marc Zyngier <marc.zyngier@arm.com> - 2015-09-14 18:50 +0200
  [PATCH v3 8/8] acpi: gsi: Cleanup acpi_register_gsi Marc Zyngier <marc.zyngier@arm.com> - 2015-09-14 18:50 +0200
  [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency on struct device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-09-14 18:50 +0200
    Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency on struct device_node "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-09-15 00:50 +0200
      Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency  on struct device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-09-15 11:20 +0200
        Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency on struct device_node "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-09-16 03:30 +0200
          Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency  on struct device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-09-16 09:50 +0200
            Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency  on struct device_node Thomas Gleixner <tglx@linutronix.de> - 2015-09-16 11:10 +0200
            Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency on struct device_node "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-09-16 14:30 +0200
    Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency on  struct device_node Tomasz Nowicki <tomasz.nowicki@linaro.org> - 2015-09-15 13:00 +0200
      Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency on  struct device_node Tomasz Nowicki <tomasz.nowicki@linaro.org> - 2015-09-15 14:10 +0200
      Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency  on struct device_node Thomas Gleixner <tglx@linutronix.de> - 2015-09-15 14:10 +0200
      Re: [PATCH v3 2/8] genirq: irqdomain: Remove irqdomain dependency  on struct device_node Marc Zyngier <marc.zyngier@arm.com> - 2015-09-15 14:30 +0200

csiph-web