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.shevchenko@linux.intel.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200520164927.39090-2-andriy.shevchenko@linux.intel.com

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 7649f38..5d14d91 100644 (file)
--- 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;
 
                /*