Skip to content

Commit 73c1b41

Browse files
committed
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 <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Sebastian Siewior <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
1 parent 530e9b7 commit 73c1b41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+77
-77
lines changed

arch/arm/kernel/smp_twd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ static int __init twd_local_timer_common_register(struct device_node *np)
339339
}
340340

341341
cpuhp_setup_state_nocalls(CPUHP_AP_ARM_TWD_STARTING,
342-
"AP_ARM_TWD_STARTING",
342+
"arm/timer/twd:starting",
343343
twd_timer_starting_cpu, twd_timer_dying_cpu);
344344

345345
twd_get_clock(np);

arch/arm/mach-mvebu/coherency.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
148148
of_node_put(cpu_config_np);
149149

150150
cpuhp_setup_state_nocalls(CPUHP_AP_ARM_MVEBU_COHERENCY,
151-
"AP_ARM_MVEBU_COHERENCY",
151+
"arm/mvebu/coherency:starting",
152152
armada_xp_clear_l2_starting, NULL);
153153
exit:
154154
set_cpu_coherent();

arch/arm/mm/cache-l2x0-pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ static __init int l2x0_pmu_init(void)
563563

564564
cpumask_set_cpu(0, &pmu_cpu);
565565
ret = cpuhp_setup_state_nocalls(CPUHP_AP_PERF_ARM_L2X0_ONLINE,
566-
"AP_PERF_ARM_L2X0_ONLINE", NULL,
566+
"perf/arm/l2x0:online", NULL,
567567
l2x0_pmu_offline_cpu);
568568
if (ret)
569569
goto out_pmu;

arch/arm/mm/cache-l2x0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ static void __init l2c310_enable(void __iomem *base, unsigned num_lock)
683683

684684
if (aux & L310_AUX_CTRL_FULL_LINE_ZERO)
685685
cpuhp_setup_state(CPUHP_AP_ARM_L2X0_STARTING,
686-
"AP_ARM_L2X0_STARTING", l2c310_starting_cpu,
686+
"arm/l2x0:starting", l2c310_starting_cpu,
687687
l2c310_dying_cpu);
688688
}
689689

arch/arm/vfp/vfpmodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ static int __init vfp_init(void)
799799
}
800800

801801
cpuhp_setup_state_nocalls(CPUHP_AP_ARM_VFP_STARTING,
802-
"AP_ARM_VFP_STARTING", vfp_starting_cpu,
802+
"arm/vfp:starting", vfp_starting_cpu,
803803
vfp_dying_cpu);
804804

805805
vfp_vector = vfp_support_entry;

arch/arm/xen/enlighten.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ static int __init xen_guest_init(void)
412412
pvclock_gtod_register_notifier(&xen_pvclock_gtod_notifier);
413413

414414
return cpuhp_setup_state(CPUHP_AP_ARM_XEN_STARTING,
415-
"AP_ARM_XEN_STARTING", xen_starting_cpu,
415+
"arm/xen:starting", xen_starting_cpu,
416416
xen_dying_cpu);
417417
}
418418
early_initcall(xen_guest_init);

arch/arm64/kernel/armv8_deprecated.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ static int __init armv8_deprecated_init(void)
640640
}
641641

642642
cpuhp_setup_state_nocalls(CPUHP_AP_ARM64_ISNDEP_STARTING,
643-
"AP_ARM64_ISNDEP_STARTING",
643+
"arm64/isndep:starting",
644644
run_all_insn_set_hw_mode, NULL);
645645
register_insn_emulation_sysctl(ctl_abi);
646646

arch/arm64/kernel/debug-monitors.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static int clear_os_lock(unsigned int cpu)
140140
static int debug_monitors_init(void)
141141
{
142142
return cpuhp_setup_state(CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING,
143-
"CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING",
143+
"arm64/debug_monitors:starting",
144144
clear_os_lock, NULL);
145145
}
146146
postcore_initcall(debug_monitors_init);

arch/arm64/kernel/hw_breakpoint.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ static int __init arch_hw_breakpoint_init(void)
10011001
* debugger will leave the world in a nice state for us.
10021002
*/
10031003
ret = cpuhp_setup_state(CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING,
1004-
"CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING",
1004+
"perf/arm64/hw_breakpoint:starting",
10051005
hw_breakpoint_reset, NULL);
10061006
if (ret)
10071007
pr_err("failed to register CPU hotplug notifier: %d\n", ret);

arch/blackfin/kernel/perf_event.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ static int __init bfin_pmu_init(void)
475475

476476
ret = perf_pmu_register(&pmu, "cpu", PERF_TYPE_RAW);
477477
if (!ret)
478-
cpuhp_setup_state(CPUHP_PERF_BFIN, "PERF_BFIN",
478+
cpuhp_setup_state(CPUHP_PERF_BFIN,"perf/bfin:starting",
479479
bfin_pmu_prepare_cpu, NULL);
480480
return ret;
481481
}

0 commit comments

Comments
 (0)