diff options
author | Caesar Wang <wxt@rock-chips.com> | 2015-06-09 05:49:59 -0400 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2015-07-05 18:46:59 -0400 |
commit | 7f0b61ad34f04b076a3d1e2b5cfc6e1fae853ec4 (patch) | |
tree | 4828f8cba0958872ab9087655abddf5a321b6ac1 | |
parent | e306bc16c53199e7440e1fee69dd91dc0a56edee (diff) |
ARM: rockchip: fix the SMP code style
Use the below scripts to check:
scripts/checkpatch.pl -f --subject arch/arm/mach-rockchip/platsmp.c
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r-- | arch/arm/mach-rockchip/platsmp.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index 4187ac2b01b3..7ebd1c1a98c6 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c | |||
@@ -100,7 +100,7 @@ static int pmu_set_power_domain(int pd, bool on) | |||
100 | ret = pmu_power_domain_is_on(pd); | 100 | ret = pmu_power_domain_is_on(pd); |
101 | if (ret < 0) { | 101 | if (ret < 0) { |
102 | pr_err("%s: could not read power domain state\n", | 102 | pr_err("%s: could not read power domain state\n", |
103 | __func__); | 103 | __func__); |
104 | return ret; | 104 | return ret; |
105 | } | 105 | } |
106 | } | 106 | } |
@@ -129,7 +129,7 @@ static int rockchip_boot_secondary(unsigned int cpu, struct task_struct *idle) | |||
129 | 129 | ||
130 | if (cpu >= ncores) { | 130 | if (cpu >= ncores) { |
131 | pr_err("%s: cpu %d outside maximum number of cpus %d\n", | 131 | pr_err("%s: cpu %d outside maximum number of cpus %d\n", |
132 | __func__, cpu, ncores); | 132 | __func__, cpu, ncores); |
133 | return -ENXIO; | 133 | return -ENXIO; |
134 | } | 134 | } |
135 | 135 | ||
@@ -139,7 +139,8 @@ static int rockchip_boot_secondary(unsigned int cpu, struct task_struct *idle) | |||
139 | return ret; | 139 | return ret; |
140 | 140 | ||
141 | if (read_cpuid_part() != ARM_CPU_PART_CORTEX_A9) { | 141 | if (read_cpuid_part() != ARM_CPU_PART_CORTEX_A9) { |
142 | /* We communicate with the bootrom to active the cpus other | 142 | /* |
143 | * We communicate with the bootrom to active the cpus other | ||
143 | * than cpu0, after a blob of initialize code, they will | 144 | * than cpu0, after a blob of initialize code, they will |
144 | * stay at wfe state, once they are actived, they will check | 145 | * stay at wfe state, once they are actived, they will check |
145 | * the mailbox: | 146 | * the mailbox: |
@@ -148,11 +149,11 @@ static int rockchip_boot_secondary(unsigned int cpu, struct task_struct *idle) | |||
148 | * The cpu0 need to wait the other cpus other than cpu0 entering | 149 | * The cpu0 need to wait the other cpus other than cpu0 entering |
149 | * the wfe state.The wait time is affected by many aspects. | 150 | * the wfe state.The wait time is affected by many aspects. |
150 | * (e.g: cpu frequency, bootrom frequency, sram frequency, ...) | 151 | * (e.g: cpu frequency, bootrom frequency, sram frequency, ...) |
151 | * */ | 152 | */ |
152 | mdelay(1); /* ensure the cpus other than cpu0 to startup */ | 153 | mdelay(1); /* ensure the cpus other than cpu0 to startup */ |
153 | 154 | ||
154 | writel(virt_to_phys(rockchip_secondary_startup), | 155 | writel(virt_to_phys(rockchip_secondary_startup), |
155 | sram_base_addr + 8); | 156 | sram_base_addr + 8); |
156 | writel(0xDEADBEAF, sram_base_addr + 4); | 157 | writel(0xDEADBEAF, sram_base_addr + 4); |
157 | dsb_sev(); | 158 | dsb_sev(); |
158 | } | 159 | } |
@@ -335,7 +336,7 @@ static int rockchip_cpu_kill(unsigned int cpu) | |||
335 | static void rockchip_cpu_die(unsigned int cpu) | 336 | static void rockchip_cpu_die(unsigned int cpu) |
336 | { | 337 | { |
337 | v7_exit_coherency_flush(louis); | 338 | v7_exit_coherency_flush(louis); |
338 | while(1) | 339 | while (1) |
339 | cpu_do_idle(); | 340 | cpu_do_idle(); |
340 | } | 341 | } |
341 | #endif | 342 | #endif |
@@ -348,4 +349,5 @@ static struct smp_operations rockchip_smp_ops __initdata = { | |||
348 | .cpu_die = rockchip_cpu_die, | 349 | .cpu_die = rockchip_cpu_die, |
349 | #endif | 350 | #endif |
350 | }; | 351 | }; |
352 | |||
351 | CPU_METHOD_OF_DECLARE(rk3066_smp, "rockchip,rk3066-smp", &rockchip_smp_ops); | 353 | CPU_METHOD_OF_DECLARE(rk3066_smp, "rockchip,rk3066-smp", &rockchip_smp_ops); |