cpu/hotplug: Cleanup state names
When the state names got added a script was used to add the extra argument to the calls. The script basically converted the state constant to a string, but the cleanup to convert these strings into meaningful ones did not happen. Replace all the useless strings with 'subsys/xxx/yyy:state' strings which are used in all the other places already. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sebastian Siewior <bigeasy@linutronix.de> Link: http://lkml.kernel.org/r/20161221192112.085444152@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
@@ -578,13 +578,13 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
|
||||
#ifdef CONFIG_SMP
|
||||
set_smp_cross_call(armada_mpic_send_doorbell);
|
||||
cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_XP_STARTING,
|
||||
"AP_IRQ_ARMADA_XP_STARTING",
|
||||
"irqchip/armada/ipi:starting",
|
||||
armada_xp_mpic_starting_cpu, NULL);
|
||||
#endif
|
||||
} else {
|
||||
#ifdef CONFIG_SMP
|
||||
cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_CASC_STARTING,
|
||||
"AP_IRQ_ARMADA_CASC_STARTING",
|
||||
"irqchip/armada/cascade:starting",
|
||||
mpic_cascaded_starting_cpu, NULL);
|
||||
#endif
|
||||
irq_set_chained_handler(parent_irq,
|
||||
|
@@ -245,7 +245,7 @@ bcm2836_arm_irqchip_smp_init(void)
|
||||
#ifdef CONFIG_SMP
|
||||
/* Unmask IPIs to the boot CPU. */
|
||||
cpuhp_setup_state(CPUHP_AP_IRQ_BCM2836_STARTING,
|
||||
"AP_IRQ_BCM2836_STARTING", bcm2836_cpu_starting,
|
||||
"irqchip/bcm2836:starting", bcm2836_cpu_starting,
|
||||
bcm2836_cpu_dying);
|
||||
|
||||
set_smp_cross_call(bcm2836_arm_irqchip_send_ipi);
|
||||
|
@@ -633,8 +633,8 @@ static void gic_smp_init(void)
|
||||
{
|
||||
set_smp_cross_call(gic_raise_softirq);
|
||||
cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GICV3_STARTING,
|
||||
"AP_IRQ_GICV3_STARTING", gic_starting_cpu,
|
||||
NULL);
|
||||
"irqchip/arm/gicv3:starting",
|
||||
gic_starting_cpu, NULL);
|
||||
}
|
||||
|
||||
static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
|
||||
|
@@ -1191,7 +1191,7 @@ static int __init __gic_init_bases(struct gic_chip_data *gic,
|
||||
set_smp_cross_call(gic_raise_softirq);
|
||||
#endif
|
||||
cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GIC_STARTING,
|
||||
"AP_IRQ_GIC_STARTING",
|
||||
"irqchip/arm/gic:starting",
|
||||
gic_starting_cpu, NULL);
|
||||
set_handle_irq(gic_handle_irq);
|
||||
if (static_key_true(&supports_deactivate))
|
||||
|
@@ -407,7 +407,7 @@ hip04_of_init(struct device_node *node, struct device_node *parent)
|
||||
set_handle_irq(hip04_handle_irq);
|
||||
|
||||
hip04_irq_dist_init(&hip04_data);
|
||||
cpuhp_setup_state(CPUHP_AP_IRQ_HIP04_STARTING, "AP_IRQ_HIP04_STARTING",
|
||||
cpuhp_setup_state(CPUHP_AP_IRQ_HIP04_STARTING, "irqchip/hip04:starting",
|
||||
hip04_irq_starting_cpu, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user