irqdomain: Rename irq_get_default_host() to irq_get_default_domain()

Jiri Slaby (SUSE) · KAGA-KOKO · commit 0a27ea384c82 · 2025-04-04T16:39:10.000+02:00
Naming interrupt domains host is confusing at best and the irqdomain code uses both domain and host inconsistently. Therefore rename irq_get_default_host() to irq_get_default_domain(). Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/all/20250319092951.37667-4-jirislaby@kernel.org
diff --git a/arch/mips/pci/pci-xtalk-bridge.c b/arch/mips/pci/pci-xtalk-bridge.c
@@ -620,7 +620,7 @@ static int bridge_probe(struct platform_device *pdev)
 	if (bridge_get_partnum(virt_to_phys((void *)bd->bridge_addr), partnum))
 		return -EPROBE_DEFER; /* not available yet */
 
-	parent = irq_get_default_host();
+	parent = irq_get_default_domain();
 	if (!parent)
 		return -ENODEV;
 	fn = irq_domain_alloc_named_fwnode("BRIDGE");
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
@@ -6041,7 +6041,7 @@ static int kvmppc_set_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
 	 * the underlying calls, which will EOI the interrupt in real
 	 * mode, need an HW IRQ number mapped in the XICS IRQ domain.
 	 */
-	host_data = irq_domain_get_irq_data(irq_get_default_host(), host_irq);
+	host_data = irq_domain_get_irq_data(irq_get_default_domain(), host_irq);
 	irq_map->r_hwirq = (unsigned int)irqd_to_hwirq(host_data);
 
 	if (i == pimap->n_mapped)
diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
@@ -1555,7 +1555,7 @@ int kvmppc_xive_set_mapped(struct kvm *kvm, unsigned long guest_irq,
 	struct kvmppc_xive_src_block *sb;
 	struct kvmppc_xive_irq_state *state;
 	struct irq_data *host_data =
-		irq_domain_get_irq_data(irq_get_default_host(), host_irq);
+		irq_domain_get_irq_data(irq_get_default_domain(), host_irq);
 	unsigned int hw_irq = (unsigned int)irqd_to_hwirq(host_data);
 	u16 idx;
 	u8 prio;
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1881,7 +1881,7 @@ static const struct irq_domain_ops pnv_irq_domain_ops = {
 static int __init pnv_msi_allocate_domains(struct pci_controller *hose, unsigned int count)
 {
 	struct pnv_phb *phb = hose->private_data;
-	struct irq_domain *parent = irq_get_default_host();
+	struct irq_domain *parent = irq_get_default_domain();
 
 	hose->fwnode = irq_domain_alloc_named_id_fwnode("PNV-MSI", phb->opal_id);
 	if (!hose->fwnode)
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
@@ -611,7 +611,7 @@ static const struct irq_domain_ops pseries_irq_domain_ops = {
 static int __pseries_msi_allocate_domains(struct pci_controller *phb,
 					  unsigned int count)
 {
-	struct irq_domain *parent = irq_get_default_host();
+	struct irq_domain *parent = irq_get_default_domain();
 
 	phb->fwnode = irq_domain_alloc_named_id_fwnode("pSeries-MSI",
 						       phb->global_number);
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
@@ -564,7 +564,7 @@ static void mpic_reenable_percpu(struct mpic *mpic)
 
 static int mpic_starting_cpu(unsigned int cpu)
 {
-	struct mpic *mpic = irq_get_default_host()->host_data;
+	struct mpic *mpic = irq_get_default_domain()->host_data;
 
 	mpic_perf_init(mpic);
 	mpic_smp_cpu_init(mpic);
@@ -700,7 +700,7 @@ static void mpic_handle_cascade_irq(struct irq_desc *desc)
 
 static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs)
 {
-	struct mpic *mpic = irq_get_default_host()->host_data;
+	struct mpic *mpic = irq_get_default_domain()->host_data;
 	irq_hw_number_t i;
 	u32 irqstat;
 
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
@@ -353,7 +353,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode,
 struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,
 					    enum irq_domain_bus_token bus_token);
 void irq_set_default_domain(struct irq_domain *domain);
-struct irq_domain *irq_get_default_host(void);
+struct irq_domain *irq_get_default_domain(void);
 int irq_domain_alloc_descs(int virq, unsigned int nr_irqs,
 			   irq_hw_number_t hwirq, int node,
 			   const struct irq_affinity_desc *affinity);
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
@@ -590,19 +590,19 @@ void irq_set_default_domain(struct irq_domain *domain)
 EXPORT_SYMBOL_GPL(irq_set_default_domain);
 
 /**
- * irq_get_default_host() - Retrieve the "default" irq domain
+ * irq_get_default_domain() - Retrieve the "default" irq domain
  *
  * Returns: the default domain, if any.
  *
  * Modern code should never use this. This should only be used on
  * systems that cannot implement a firmware->fwnode mapping (which
  * both DT and ACPI provide).
  */
-struct irq_domain *irq_get_default_host(void)
+struct irq_domain *irq_get_default_domain(void)
 {
 	return irq_default_domain;
 }
-EXPORT_SYMBOL_GPL(irq_get_default_host);
+EXPORT_SYMBOL_GPL(irq_get_default_domain);
 
 static bool irq_domain_is_nomap(struct irq_domain *domain)
 {

Original file line number	Diff line number	Diff line change
`@@ -1881,7 +1881,7 @@ static const struct irq_domain_ops pnv_irq_domain_ops = {`
`1881`	`1881`	`static int __init pnv_msi_allocate_domains(struct pci_controller *hose, unsigned int count)`
`1882`	`1882`	`{`
`1883`	`1883`	`struct pnv_phb *phb = hose->private_data;`
`1884`		`- struct irq_domain *parent = irq_get_default_host();`
	`1884`	`+ struct irq_domain *parent = irq_get_default_domain();`
`1885`	`1885`
`1886`	`1886`	`hose->fwnode = irq_domain_alloc_named_id_fwnode("PNV-MSI", phb->opal_id);`
`1887`	`1887`	`if (!hose->fwnode)`
Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ static const struct irq_domain_ops pseries_irq_domain_ops = {`
`611`	`611`	`static int __pseries_msi_allocate_domains(struct pci_controller *phb,`
`612`	`612`	`unsigned int count)`
`613`	`613`	`{`
`614`		`- struct irq_domain *parent = irq_get_default_host();`
	`614`	`+ struct irq_domain *parent = irq_get_default_domain();`
`615`	`615`
`616`	`616`	`phb->fwnode = irq_domain_alloc_named_id_fwnode("pSeries-MSI",`
`617`	`617`	`phb->global_number);`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ static void mpic_reenable_percpu(struct mpic *mpic)`
`564`	`564`
`565`	`565`	`static int mpic_starting_cpu(unsigned int cpu)`
`566`	`566`	`{`
`567`		`- struct mpic *mpic = irq_get_default_host()->host_data;`
	`567`	`+ struct mpic *mpic = irq_get_default_domain()->host_data;`
`568`	`568`
`569`	`569`	`mpic_perf_init(mpic);`
`570`	`570`	`mpic_smp_cpu_init(mpic);`
`@@ -700,7 +700,7 @@ static void mpic_handle_cascade_irq(struct irq_desc *desc)`
`700`	`700`
`701`	`701`	`static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs)`
`702`	`702`	`{`
`703`		`- struct mpic *mpic = irq_get_default_host()->host_data;`
	`703`	`+ struct mpic *mpic = irq_get_default_domain()->host_data;`
`704`	`704`	`irq_hw_number_t i;`
`705`	`705`	`u32 irqstat;`
`706`	`706`
Original file line number	Diff line number	Diff line change
`@@ -590,19 +590,19 @@ void irq_set_default_domain(struct irq_domain *domain)`
`590`	`590`	`EXPORT_SYMBOL_GPL(irq_set_default_domain);`
`591`	`591`
`592`	`592`	`/**`
`593`		`- * irq_get_default_host() - Retrieve the "default" irq domain`
	`593`	`+ * irq_get_default_domain() - Retrieve the "default" irq domain`
`594`	`594`	`*`
`595`	`595`	`* Returns: the default domain, if any.`
`596`	`596`	`*`
`597`	`597`	`* Modern code should never use this. This should only be used on`
`598`	`598`	`* systems that cannot implement a firmware->fwnode mapping (which`
`599`	`599`	`* both DT and ACPI provide).`
`600`	`600`	`*/`
`601`		`-struct irq_domain *irq_get_default_host(void)`
	`601`	`+struct irq_domain *irq_get_default_domain(void)`
`602`	`602`	`{`
`603`	`603`	`return irq_default_domain;`
`604`	`604`	`}`
`605`		`-EXPORT_SYMBOL_GPL(irq_get_default_host);`
	`605`	`+EXPORT_SYMBOL_GPL(irq_get_default_domain);`
`606`	`606`
`607`	`607`	`static bool irq_domain_is_nomap(struct irq_domain *domain)`
`608`	`608`	`{`