irqchip/armada-xp: Consolidate hotplug state space

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

The mpic is either the main interrupt controller or is cascaded behind a
GIC. The mpic is single instance and the modes are mutually exclusive, so
there is no reason to have seperate cpu hotplug states.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Sebastian Siewior <bigeasy@linutronix.de>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Link: http://lkml.kernel.org/r/20161221192112.333161745@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Thomas Gleixner 9 years ago 008b69e4 6896bcd1

+1 -2

2 changed files

expand all

drivers

irqchip

irq-armada-370-xp.c

include

linux

cpuhotplug.h

+1 -1

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

··· 583 583 #endif 584 584 } else { 585 585 #ifdef CONFIG_SMP 586 - cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_CASC_STARTING, 586 + cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_ARMADA_XP_STARTING, 587 587 "irqchip/armada/cascade:starting", 588 588 mpic_cascaded_starting_cpu, NULL); 589 589 #endif

-1

include/linux/cpuhotplug.h

··· 82 82 CPUHP_AP_IRQ_GIC_STARTING, 83 83 CPUHP_AP_IRQ_HIP04_STARTING, 84 84 CPUHP_AP_IRQ_ARMADA_XP_STARTING, 85 - CPUHP_AP_IRQ_ARMADA_CASC_STARTING, 86 85 CPUHP_AP_IRQ_BCM2836_STARTING, 87 86 CPUHP_AP_ARM_MVEBU_COHERENCY, 88 87 CPUHP_AP_PERF_X86_UNCORE_STARTING,