From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932893AbbJMR7s (ORCPT ); Tue, 13 Oct 2015 13:59:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43211 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932816AbbJMR7p (ORCPT ); Tue, 13 Oct 2015 13:59:45 -0400 Date: Tue, 13 Oct 2015 10:59:05 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: rafael.j.wysocki@intel.com, tomasz.nowicki@linaro.org, hanjun.guo@linaro.org, marc.zyngier@arm.com, graeme@xora.org.uk, tglx@linutronix.de, Suravee.Suthikulpanit@amd.com, jakeo@microsoft.com, rjw@rjwysocki.net, hpa@zytor.com, jiang.liu@linux.intel.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, lorenzo.pieralisi@arm.com, jason@lakedaemon.net, mingo@kernel.org Reply-To: tglx@linutronix.de, Suravee.Suthikulpanit@amd.com, jakeo@microsoft.com, tomasz.nowicki@linaro.org, rafael.j.wysocki@intel.com, hanjun.guo@linaro.org, marc.zyngier@arm.com, graeme@xora.org.uk, jason@lakedaemon.net, lorenzo.pieralisi@arm.com, mingo@kernel.org, hpa@zytor.com, rjw@rjwysocki.net, linux-kernel@vger.kernel.org, jiang.liu@linux.intel.com, linux-arm-kernel@lists.infradead.org In-Reply-To: <1444737105-31573-15-git-send-email-marc.zyngier@arm.com> References: <1444737105-31573-15-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] acpi/gsi: Cleanup acpi_register_gsi Git-Commit-ID: 462e4fc793b1071dee7c15680218a001318060c5 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: 462e4fc793b1071dee7c15680218a001318060c5 Gitweb: http://git.kernel.org/tip/462e4fc793b1071dee7c15680218a001318060c5 Author: Marc Zyngier AuthorDate: Tue, 13 Oct 2015 12:51:42 +0100 Committer: Thomas Gleixner CommitDate: Tue, 13 Oct 2015 19:01:25 +0200 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 Acked-by: Rafael J. Wysocki 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-15-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- drivers/acpi/gsi.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/acpi/gsi.c b/drivers/acpi/gsi.c index 202a8fe..fa4585a 100644 --- a/drivers/acpi/gsi.c +++ b/drivers/acpi/gsi.c @@ -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); + struct irq_fwspec fwspec; - if (acpi_gsi_domain_id) { - struct irq_fwspec fwspec; - - fwspec.fwnode = acpi_gsi_domain_id; - fwspec.param[0] = gsi; - fwspec.param[1] = irq_type; - fwspec.param_count = 2; - - return irq_create_fwspec_mapping(&fwspec); - } else { - irq = irq_create_mapping(NULL, gsi); - if (!irq) - return -EINVAL; + if (WARN_ON(!acpi_gsi_domain_id)) { + pr_warn("GSI: No registered irqchip, giving up\n"); + 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; + fwspec.fwnode = acpi_gsi_domain_id; + fwspec.param[0] = gsi; + fwspec.param[1] = acpi_gsi_get_irq_type(trigger, polarity); + fwspec.param_count = 2; + + return irq_create_fwspec_mapping(&fwspec); } EXPORT_SYMBOL_GPL(acpi_register_gsi);