OSDN Git Service

ARM: hisi: rename smp_prepares_cpus function
authorWang Long <long.wanglong@huawei.com>
Wed, 24 Dec 2014 03:10:00 +0000 (03:10 +0000)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Jan 2015 22:32:53 +0000 (14:32 -0800)
As hix5hd2 and hip01 has the same .smp_prepare_cpus
in struct smp_operations, so rename hix5hd2_smp_prepare_cpus
to hisi_common_smp_prepare_cpus.

the hip01 will use hisi_common_smp_prepare_cpus in its
struct smp_operations.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-hisi/platsmp.c

index 575dd82..b3c3a58 100644 (file)
@@ -96,7 +96,7 @@ struct smp_operations hi3xxx_smp_ops __initdata = {
 #endif
 };
 
-static void __init hix5hd2_smp_prepare_cpus(unsigned int max_cpus)
+static void __init hisi_common_smp_prepare_cpus(unsigned int max_cpus)
 {
        hisi_enable_scu_a9();
 }
@@ -125,7 +125,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle)
 
 
 struct smp_operations hix5hd2_smp_ops __initdata = {
-       .smp_prepare_cpus       = hix5hd2_smp_prepare_cpus,
+       .smp_prepare_cpus       = hisi_common_smp_prepare_cpus,
        .smp_boot_secondary     = hix5hd2_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU
        .cpu_die                = hix5hd2_cpu_die,