Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36e5b0e3 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

coresight/etm3/4x: Consolidate hotplug state space 



Even if both drivers are compiled in only one instance can run on a given
system depending on the available tracer cell.

So having seperate hotplug states for them is pointless.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: http://lkml.kernel.org/r/20161221192112.162765484@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 73c1b41e

drivers/hwtracing/coresight/coresight-etm4x.c

+2 −2
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) 
		dev_err(dev, "ETM arch init failed\n");



	if (!etm4_count++) {

		cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING,

		cpuhp_setup_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING,

					  "arm/coresight4:starting",

					  etm4_starting_cpu, etm4_dying_cpu);

		ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
@@ -1037,7 +1037,7 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) 


err_arch_supported:

	if (--etm4_count == 0) {

		cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT4_STARTING);

		cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING);

		if (hp_online)

			cpuhp_remove_state_nocalls(hp_online);

	}

include/linux/cpuhotplug.h

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ enum cpuhp_state { 
	CPUHP_AP_DUMMY_TIMER_STARTING,

	CPUHP_AP_ARM_XEN_STARTING,

	CPUHP_AP_ARM_CORESIGHT_STARTING,

	CPUHP_AP_ARM_CORESIGHT4_STARTING,

	CPUHP_AP_ARM64_ISNDEP_STARTING,

	CPUHP_AP_SMPCFD_DYING,

	CPUHP_AP_X86_TBOOT_DYING,