Skip to content

Commit 8752660

Browse files
andy-shevMarc Zyngier
authored andcommitted
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 <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 181e9d4 commit 8752660

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

kernel/irq/irqdomain.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -161,22 +161,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,
161161
domain->name = fwid->name;
162162
break;
163163
}
164-
#ifdef CONFIG_ACPI
165-
} else if (is_acpi_device_node(fwnode)) {
166-
struct acpi_buffer buf = {
167-
.length = ACPI_ALLOCATE_BUFFER,
168-
};
169-
acpi_handle handle;
170-
171-
handle = acpi_device_handle(to_acpi_device_node(fwnode));
172-
if (acpi_get_name(handle, ACPI_FULL_PATHNAME, &buf) == AE_OK) {
173-
domain->name = buf.pointer;
174-
domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
175-
}
176-
177-
domain->fwnode = fwnode;
178-
#endif
179-
} else if (is_of_node(fwnode)) {
164+
} else if (is_of_node(fwnode) || is_acpi_device_node(fwnode)) {
180165
char *name;
181166

182167
/*

0 commit comments

Comments
 (0)