Even if both drivers are compiled in only one instance can run on a given system depending on the available GIC version. So having seperate hotplug states for them is pointless.
Unified · Split
| @@ -632,7 +632,7 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) · 631 unmodified lines | ||
| 632 | 632 | static void gic_smp_init(void) |
| 633 | 633 | { |
| 634 | 634 | set_smp_cross_call(gic_raise_softirq); |
| 635 | − cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GICV3_STARTING, | |
| 635 | + cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GIC_STARTING, | |
| 636 | 636 | "irqchip/arm/gicv3:starting", |
| 637 | 637 | gic_starting_cpu, NULL); |
| 638 | 638 | } |
| @@ -80,7 +80,6 @@ enum cpuhp_state { · 79 unmodified lines | ||
| 80 | 80 | CPUHP_AP_SCHED_STARTING, |
| 81 | 81 | CPUHP_AP_RCUTREE_DYING, |
| 82 | 82 | CPUHP_AP_IRQ_GIC_STARTING, |
| 83 | − CPUHP_AP_IRQ_GICV3_STARTING, | |
| 84 | 83 | CPUHP_AP_IRQ_HIP04_STARTING, |
| 85 | 84 | CPUHP_AP_IRQ_ARMADA_XP_STARTING, |
| 86 | 85 | CPUHP_AP_IRQ_ARMADA_CASC_STARTING, |