Skip to content

Commit

Permalink
irqdomain: Get rid of special treatment for ACPI in __irq_domain_add()
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Andy Shevchenko authored and Marc Zyngier committed May 21, 2020
1 parent 181e9d4 commit 8752660
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions kernel/irq/irqdomain.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down

0 comments on commit 8752660

Please sign in to comment.