ARM: shmobile: apmu: Move #ifdef CONFIG_SMP to cover more functions

geertu · horms · commit d3f3fb0cfdcf · 2016-06-29T14:42:30.000+02:00
shmobile_smp_apmu_prepare_cpus() is used only if CONFIG_SMP=y.

Hence move the #ifdef to cover shmobile_smp_apmu_prepare_cpus() and all
functions only called by it (apmu_init_cpu() and apmu_parse_cfg()).

Signed-off-by: Geert Uytterhoeven &lt;geert+renesas@glider.be&gt;
Reviewed-by: Ulrich Hecht &lt;ulrich.hecht+renesas@gmail.com&gt;
Signed-off-by: Simon Horman &lt;horms+renesas@verge.net.au&gt;
diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c
@@ -74,6 +74,7 @@ static int __maybe_unused apmu_wrap(int cpu, int (*fn)(void __iomem *p, int cpu)
 	return p ? fn(p, apmu_cpus[cpu].bit) : -EINVAL;
 }
 
+#ifdef CONFIG_SMP
 static void apmu_init_cpu(struct resource *res, int cpu, int bit)
 {
 	if ((cpu >= ARRAY_SIZE(apmu_cpus)) || apmu_cpus[cpu].iomem)
@@ -128,7 +129,6 @@ void __init shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus,
 	apmu_parse_cfg(apmu_init_cpu, apmu_config, num);
 }
 
-#ifdef CONFIG_SMP
 int shmobile_smp_apmu_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
 	/* For this particular CPU register boot vector */

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ static int __maybe_unused apmu_wrap(int cpu, int (fn)(void __iomem p, int cpu)`
`74`	`74`	`return p ? fn(p, apmu_cpus[cpu].bit) : -EINVAL;`
`75`	`75`	`}`
`76`	`76`
	`77`	`+#ifdef CONFIG_SMP`
`77`	`78`	`static void apmu_init_cpu(struct resource *res, int cpu, int bit)`
`78`	`79`	`{`
`79`	`80`	`if ((cpu >= ARRAY_SIZE(apmu_cpus)) \|\| apmu_cpus[cpu].iomem)`
`@@ -128,7 +129,6 @@ void __init shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus,`
`128`	`129`	`apmu_parse_cfg(apmu_init_cpu, apmu_config, num);`
`129`	`130`	`}`
`130`	`131`
`131`		`-#ifdef CONFIG_SMP`
`132`	`132`	`int shmobile_smp_apmu_boot_secondary(unsigned int cpu, struct task_struct *idle)`
`133`	`133`	`{`
`134`	`134`	`/* For this particular CPU register boot vector */`