Commit 462e4fc7 authored Oct 13, 2015 by Marc Zyngier Committed by Thomas Gleixner Oct 13, 2015

acpi/gsi: Cleanup acpi_register_gsi



As the only user of drivers/acpi/gsi.c is now using acpi_set_irq_model
to set acpi_gsi_domain_id 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>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-and-tested-by: Hanjun Guo <hanjun.guo@linaro.org>
Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Graeme Gregory <graeme@xora.org.uk>
Cc: Jake Oshins <jakeo@microsoft.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Link: http://lkml.kernel.org/r/1444737105-31573-15-git-send-email-marc.zyngier@arm.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 18bd8847

drivers/acpi/gsi.c

+10 −20

Original line number	Diff line number	Diff line
		@@ -73,29 +73,19 @@ EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
		int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
		int polarity)
		{
		unsigned int irq;
		unsigned int irq_type = acpi_gsi_get_irq_type(trigger, polarity);

		if (acpi_gsi_domain_id) {
		struct irq_fwspec fwspec;

		if (WARN_ON(!acpi_gsi_domain_id)) {
		pr_warn("GSI: No registered irqchip, giving up\n");
		return -EINVAL;
		}

		fwspec.fwnode = acpi_gsi_domain_id;
		fwspec.param[0] = gsi;
		fwspec.param[1] = irq_type;
		fwspec.param[1] = acpi_gsi_get_irq_type(trigger, polarity);
		fwspec.param_count = 2;

		return irq_create_fwspec_mapping(&fwspec);
		} else {
		irq = irq_create_mapping(NULL, gsi);
		if (!irq)
		return -EINVAL;
		}

		/* 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;
		}
		EXPORT_SYMBOL_GPL(acpi_register_gsi);