Skip to content

Commit

Permalink
ARM: mvebu: Remove the unused argument of set_cpu_coherent()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gregory CLEMENT authored and Jason Cooper committed May 8, 2014
1 parent b41375f commit 952f4ca
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-mvebu/coherency.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static struct of_device_id of_coherency_table[] = {
/* Function defined in coherency_ll.S */
int ll_set_cpu_coherent(void);

int set_cpu_coherent(int smp_group_id)
int set_cpu_coherent(void)
{
if (!coherency_base) {
pr_warn("Can't make current CPU cache coherent.\n");
Expand Down Expand Up @@ -302,7 +302,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
sync_cache_w(&coherency_phys_base);
coherency_base = of_iomap(np, 0);
coherency_cpu_base = of_iomap(np, 1);
set_cpu_coherent(0);
set_cpu_coherent();
}

static void __init armada_375_380_coherency_init(struct device_node *np)
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-mvebu/coherency.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#define __MACH_370_XP_COHERENCY_H

extern unsigned long coherency_phys_base;
int set_cpu_coherent(void);

int set_cpu_coherent(int smp_group_id);
int coherency_init(void);
int coherency_available(void);

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-mvebu/platsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)

set_secondary_cpus_clock();
flush_cache_all();
set_cpu_coherent(0);
set_cpu_coherent();

/*
* In order to boot the secondary CPUs we need to ensure
Expand Down

0 comments on commit 952f4ca

Please sign in to comment.