Commit 8fc0d470 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Simon Horman

ARM: shmobile: r8a7779: hide unused r8a7779_platform_cpu_kill

After the cleanup in r8a7779_smp_prepare_cpus(), the only remaining caller of
r8a7779_platform_cpu_kill() is in an ifdef, which leads to a build warning
without CONFIG_HOTPLUG_CPU:

arch/arm/mach-shmobile/smp-r8a7779.c:26:12: error: 'r8a7779_platform_cpu_kill' defined but not used [-Werror=unused-function]

This moves the function inside of that #ifdef to avoid the warning.

Fixes: 62f55ce6 ("ARM: shmobile: r8a7779: Stop powering down secondary CPUs during early boot")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent c83e9c48
...@@ -23,17 +23,6 @@ ...@@ -23,17 +23,6 @@
#define AVECR IOMEM(0xfe700040) #define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000 #define R8A7779_SCU_BASE 0xf0000000
static int r8a7779_platform_cpu_kill(unsigned int cpu)
{
int ret = -EIO;
cpu = cpu_logical_map(cpu);
if (cpu)
ret = rcar_sysc_power_down_cpu(cpu);
return ret ? ret : 1;
}
static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle) static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
{ {
int ret = -EIO; int ret = -EIO;
...@@ -55,6 +44,17 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus) ...@@ -55,6 +44,17 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
} }
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
static int r8a7779_platform_cpu_kill(unsigned int cpu)
{
int ret = -EIO;
cpu = cpu_logical_map(cpu);
if (cpu)
ret = rcar_sysc_power_down_cpu(cpu);
return ret ? ret : 1;
}
static int r8a7779_cpu_kill(unsigned int cpu) static int r8a7779_cpu_kill(unsigned int cpu)
{ {
if (shmobile_smp_scu_cpu_kill(cpu)) if (shmobile_smp_scu_cpu_kill(cpu))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment