Skip to content

Commit 0a27ea3

Browse files
Jiri Slaby (SUSE)KAGA-KOKO
authored andcommitted
irqdomain: Rename irq_get_default_host() to irq_get_default_domain()
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
1 parent 825dfab commit 0a27ea3

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

arch/mips/pci/pci-xtalk-bridge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ static int bridge_probe(struct platform_device *pdev)
620620
if (bridge_get_partnum(virt_to_phys((void *)bd->bridge_addr), partnum))
621621
return -EPROBE_DEFER; /* not available yet */
622622

623-
parent = irq_get_default_host();
623+
parent = irq_get_default_domain();
624624
if (!parent)
625625
return -ENODEV;
626626
fn = irq_domain_alloc_named_fwnode("BRIDGE");

arch/powerpc/kvm/book3s_hv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6041,7 +6041,7 @@ static int kvmppc_set_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
60416041
* the underlying calls, which will EOI the interrupt in real
60426042
* mode, need an HW IRQ number mapped in the XICS IRQ domain.
60436043
*/
6044-
host_data = irq_domain_get_irq_data(irq_get_default_host(), host_irq);
6044+
host_data = irq_domain_get_irq_data(irq_get_default_domain(), host_irq);
60456045
irq_map->r_hwirq = (unsigned int)irqd_to_hwirq(host_data);
60466046

60476047
if (i == pimap->n_mapped)

arch/powerpc/kvm/book3s_xive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ int kvmppc_xive_set_mapped(struct kvm *kvm, unsigned long guest_irq,
15551555
struct kvmppc_xive_src_block *sb;
15561556
struct kvmppc_xive_irq_state *state;
15571557
struct irq_data *host_data =
1558-
irq_domain_get_irq_data(irq_get_default_host(), host_irq);
1558+
irq_domain_get_irq_data(irq_get_default_domain(), host_irq);
15591559
unsigned int hw_irq = (unsigned int)irqd_to_hwirq(host_data);
15601560
u16 idx;
15611561
u8 prio;

arch/powerpc/platforms/powernv/pci-ioda.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1881,7 +1881,7 @@ static const struct irq_domain_ops pnv_irq_domain_ops = {
18811881
static int __init pnv_msi_allocate_domains(struct pci_controller *hose, unsigned int count)
18821882
{
18831883
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();
18851885

18861886
hose->fwnode = irq_domain_alloc_named_id_fwnode("PNV-MSI", phb->opal_id);
18871887
if (!hose->fwnode)

arch/powerpc/platforms/pseries/msi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ static const struct irq_domain_ops pseries_irq_domain_ops = {
611611
static int __pseries_msi_allocate_domains(struct pci_controller *phb,
612612
unsigned int count)
613613
{
614-
struct irq_domain *parent = irq_get_default_host();
614+
struct irq_domain *parent = irq_get_default_domain();
615615

616616
phb->fwnode = irq_domain_alloc_named_id_fwnode("pSeries-MSI",
617617
phb->global_number);

drivers/irqchip/irq-armada-370-xp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ static void mpic_reenable_percpu(struct mpic *mpic)
564564

565565
static int mpic_starting_cpu(unsigned int cpu)
566566
{
567-
struct mpic *mpic = irq_get_default_host()->host_data;
567+
struct mpic *mpic = irq_get_default_domain()->host_data;
568568

569569
mpic_perf_init(mpic);
570570
mpic_smp_cpu_init(mpic);
@@ -700,7 +700,7 @@ static void mpic_handle_cascade_irq(struct irq_desc *desc)
700700

701701
static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs)
702702
{
703-
struct mpic *mpic = irq_get_default_host()->host_data;
703+
struct mpic *mpic = irq_get_default_domain()->host_data;
704704
irq_hw_number_t i;
705705
u32 irqstat;
706706

include/linux/irqdomain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode,
353353
struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,
354354
enum irq_domain_bus_token bus_token);
355355
void irq_set_default_domain(struct irq_domain *domain);
356-
struct irq_domain *irq_get_default_host(void);
356+
struct irq_domain *irq_get_default_domain(void);
357357
int irq_domain_alloc_descs(int virq, unsigned int nr_irqs,
358358
irq_hw_number_t hwirq, int node,
359359
const struct irq_affinity_desc *affinity);

kernel/irq/irqdomain.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,19 +590,19 @@ void irq_set_default_domain(struct irq_domain *domain)
590590
EXPORT_SYMBOL_GPL(irq_set_default_domain);
591591

592592
/**
593-
* irq_get_default_host() - Retrieve the "default" irq domain
593+
* irq_get_default_domain() - Retrieve the "default" irq domain
594594
*
595595
* Returns: the default domain, if any.
596596
*
597597
* Modern code should never use this. This should only be used on
598598
* systems that cannot implement a firmware->fwnode mapping (which
599599
* both DT and ACPI provide).
600600
*/
601-
struct irq_domain *irq_get_default_host(void)
601+
struct irq_domain *irq_get_default_domain(void)
602602
{
603603
return irq_default_domain;
604604
}
605-
EXPORT_SYMBOL_GPL(irq_get_default_host);
605+
EXPORT_SYMBOL_GPL(irq_get_default_domain);
606606

607607
static bool irq_domain_is_nomap(struct irq_domain *domain)
608608
{

0 commit comments

Comments
 (0)