The following commit has been merged into the irq/core branch of tip: Commit-ID: 87526603c89256e18ad2c23821fdaf376b072fc8 Gitweb: https://git.kernel.org/tip/87526603c89256e18ad2c23821fdaf376b072fc8 Author: Andy Shevchenko <andriy.shevche...@linux.intel.com> AuthorDate: Wed, 20 May 2020 19:49:26 +03:00 Committer: Marc Zyngier <m...@kernel.org> CommitterDate: Thu, 21 May 2020 10:51:50 +01:00
irqdomain: Get rid of special treatment for ACPI in __irq_domain_add() Now that __irq_domain_add() is able to better deals with generic fwnodes, there is no need to special-case ACPI anymore. Get rid of the special treatment for ACPI. Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com> Signed-off-by: Marc Zyngier <m...@kernel.org> Link: https://lore.kernel.org/r/20200520164927.39090-2-andriy.shevche...@linux.intel.com --- kernel/irq/irqdomain.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 7649f38..5d14d91 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -161,22 +161,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, domain->name = fwid->name; break; } -#ifdef CONFIG_ACPI - } else if (is_acpi_device_node(fwnode)) { - struct acpi_buffer buf = { - .length = ACPI_ALLOCATE_BUFFER, - }; - acpi_handle handle; - - handle = acpi_device_handle(to_acpi_device_node(fwnode)); - if (acpi_get_name(handle, ACPI_FULL_PATHNAME, &buf) == AE_OK) { - domain->name = buf.pointer; - domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED; - } - - domain->fwnode = fwnode; -#endif - } else if (is_of_node(fwnode)) { + } else if (is_of_node(fwnode) || is_acpi_device_node(fwnode)) { char *name; /*
