Skip to content

Commit 28a9ff2

Browse files
jhovoldMarc Zyngier
authored andcommitted
irqdomain: Drop dead domain-name assignment
Since commit d59f661 ("genirq: Allow fwnode to carry name information only") an IRQ domain is always given a name during allocation (e.g. used for the debugfs entry). Drop the leftover name assignment when allocating the first IRQ. Tested-by: Hsin-Yi Wang <[email protected]> Tested-by: Mark-PK Tsai <[email protected]> Signed-off-by: Johan Hovold <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 47d1932 commit 28a9ff2

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

kernel/irq/irqdomain.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -619,10 +619,6 @@ static int irq_domain_associate_locked(struct irq_domain *domain, unsigned int v
619619
irq_data->hwirq = 0;
620620
return ret;
621621
}
622-
623-
/* If not already assigned, give the domain the chip's name */
624-
if (!domain->name && irq_data->chip)
625-
domain->name = irq_data->chip->name;
626622
}
627623

628624
domain->mapcount++;
@@ -1182,10 +1178,6 @@ static void irq_domain_insert_irq(int virq)
11821178

11831179
domain->mapcount++;
11841180
irq_domain_set_mapping(domain, data->hwirq, data);
1185-
1186-
/* If not already assigned, give the domain the chip's name */
1187-
if (!domain->name && data->chip)
1188-
domain->name = data->chip->name;
11891181
}
11901182

11911183
irq_clear_status_flags(virq, IRQ_NOREQUEST);

0 commit comments

Comments
 (0)