diff mbox series

[irqchip:,irq/irqchip-next] irqdomain: Drop dead domain-name assignment

Message ID 167631724456.4906.17248424991679732904.tip-bot2@tip-bot2
State New
Headers
Series [irqchip:,irq/irqchip-next] irqdomain: Drop dead domain-name assignment |

Commit Message

tip-bot2 for Thomas Gleixner Feb. 13, 2023, 7:40 p.m. UTC 
  The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     28a9ff23d8b56db09cb01cef174a205ea5e2ca49
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/28a9ff23d8b56db09cb01cef174a205ea5e2ca49
Author:        Johan Hovold <johan+linaro@kernel.org>
AuthorDate:    Mon, 13 Feb 2023 11:42:51 +01:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Mon, 13 Feb 2023 19:31:24 

irqdomain: Drop dead domain-name assignment

Since commit d59f6617eef0 ("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 <hsinyi@chromium.org>
Tested-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230213104302.17307-10-johan+linaro@kernel.org
---
 kernel/irq/irqdomain.c | 8 --------
 1 file changed, 8 deletions(-)
diff mbox series

Patch

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index c7113e7..6bd6b61 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -619,10 +619,6 @@  static int irq_domain_associate_locked(struct irq_domain *domain, unsigned int v
 			irq_data->hwirq = 0;
 			return ret;
 		}
-
-		/* If not already assigned, give the domain the chip's name */
-		if (!domain->name && irq_data->chip)
-			domain->name = irq_data->chip->name;
 	}
 
 	domain->mapcount++;
@@ -1182,10 +1178,6 @@  static void irq_domain_insert_irq(int virq)
 
 		domain->mapcount++;
 		irq_domain_set_mapping(domain, data->hwirq, data);
-
-		/* If not already assigned, give the domain the chip's name */
-		if (!domain->name && data->chip)
-			domain->name = data->chip->name;
 	}
 
 	irq_clear_status_flags(virq, IRQ_NOREQUEST);