aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-02-13 19:41:01 -0500
committerSimon Horman <horms+renesas@verge.net.au>2015-02-23 17:12:16 -0500
commitfd9454ab51fa92f43ae5b7a71c42f2ee8417c2a2 (patch)
tree6933dd3dce8d8cf20cac0897881a5ff895164a6e /arch/arm/mach-shmobile
parentbb04883b2519b23bb4d3f4f7dac51cdda9a5e61d (diff)
ARM: shmobile: r8a7779: Remove redundant cpu_disable implementation
By default only the non-boot CPUs can be hotplugged if the smp_operations structure doesn't have the cpu_disable function pointer set. r8a7779_cpu_disable() implements the same logic, only non-boot CPUs can be hotplugged, so it's redundant to override the default behavior. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: Magnus Damm <damm+renesas@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/smp-r8a7779.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 9fc280e24ef4..01f792fcb220 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -124,19 +124,12 @@ static int r8a7779_cpu_kill(unsigned int cpu)
124 124
125 return 0; 125 return 0;
126} 126}
127
128static int r8a7779_cpu_disable(unsigned int cpu)
129{
130 /* only CPU1->3 have power domains, do not allow hotplug of CPU0 */
131 return cpu == 0 ? -EPERM : 0;
132}
133#endif /* CONFIG_HOTPLUG_CPU */ 127#endif /* CONFIG_HOTPLUG_CPU */
134 128
135struct smp_operations r8a7779_smp_ops __initdata = { 129struct smp_operations r8a7779_smp_ops __initdata = {
136 .smp_prepare_cpus = r8a7779_smp_prepare_cpus, 130 .smp_prepare_cpus = r8a7779_smp_prepare_cpus,
137 .smp_boot_secondary = r8a7779_boot_secondary, 131 .smp_boot_secondary = r8a7779_boot_secondary,
138#ifdef CONFIG_HOTPLUG_CPU 132#ifdef CONFIG_HOTPLUG_CPU
139 .cpu_disable = r8a7779_cpu_disable,
140 .cpu_die = shmobile_smp_scu_cpu_die, 133 .cpu_die = shmobile_smp_scu_cpu_die,
141 .cpu_kill = r8a7779_cpu_kill, 134 .cpu_kill = r8a7779_cpu_kill,
142#endif 135#endif