aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2014-04-14 11:10:07 -0400
committerJason Cooper <jason@lakedaemon.net>2014-05-08 12:18:52 -0400
commit952f4ca79b4ec7114291aa711add1b36c6ba7515 (patch)
tree16049379e6e358475092618d96893fb15770d189 /arch/arm
parentb41375f71aceadb7d74a18aafba4da5024fc104b (diff)
ARM: mvebu: Remove the unused argument of set_cpu_coherent()
set_cpu_coherent() took the SMP group ID as parameter. But this parameter was never used, and the CPU always uses the SMP group 0. So we can remove this parameter. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Link: https://lkml.kernel.org/r/1397488214-20685-5-git-send-email-gregory.clement@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mvebu/coherency.c4
-rw-r--r--arch/arm/mach-mvebu/coherency.h2
-rw-r--r--arch/arm/mach-mvebu/platsmp.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index 2df90c998820..944372a18ed6 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -63,7 +63,7 @@ static struct of_device_id of_coherency_table[] = {
63/* Function defined in coherency_ll.S */ 63/* Function defined in coherency_ll.S */
64int ll_set_cpu_coherent(void); 64int ll_set_cpu_coherent(void);
65 65
66int set_cpu_coherent(int smp_group_id) 66int set_cpu_coherent(void)
67{ 67{
68 if (!coherency_base) { 68 if (!coherency_base) {
69 pr_warn("Can't make current CPU cache coherent.\n"); 69 pr_warn("Can't make current CPU cache coherent.\n");
@@ -302,7 +302,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
302 sync_cache_w(&coherency_phys_base); 302 sync_cache_w(&coherency_phys_base);
303 coherency_base = of_iomap(np, 0); 303 coherency_base = of_iomap(np, 0);
304 coherency_cpu_base = of_iomap(np, 1); 304 coherency_cpu_base = of_iomap(np, 1);
305 set_cpu_coherent(0); 305 set_cpu_coherent();
306} 306}
307 307
308static void __init armada_375_380_coherency_init(struct device_node *np) 308static void __init armada_375_380_coherency_init(struct device_node *np)
diff --git a/arch/arm/mach-mvebu/coherency.h b/arch/arm/mach-mvebu/coherency.h
index ab594a75fef3..54cb7607b526 100644
--- a/arch/arm/mach-mvebu/coherency.h
+++ b/arch/arm/mach-mvebu/coherency.h
@@ -15,8 +15,8 @@
15#define __MACH_370_XP_COHERENCY_H 15#define __MACH_370_XP_COHERENCY_H
16 16
17extern unsigned long coherency_phys_base; 17extern unsigned long coherency_phys_base;
18int set_cpu_coherent(void);
18 19
19int set_cpu_coherent(int smp_group_id);
20int coherency_init(void); 20int coherency_init(void);
21int coherency_available(void); 21int coherency_available(void);
22 22
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index 75436c0023a8..88b976b31719 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -103,7 +103,7 @@ static void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)
103 103
104 set_secondary_cpus_clock(); 104 set_secondary_cpus_clock();
105 flush_cache_all(); 105 flush_cache_all();
106 set_cpu_coherent(0); 106 set_cpu_coherent();
107 107
108 /* 108 /*
109 * In order to boot the secondary CPUs we need to ensure 109 * In order to boot the secondary CPUs we need to ensure