diff options
| author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2014-09-02 17:19:14 -0400 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-09-16 06:55:11 -0400 |
| commit | ed62e330948dea39b455d94dc14522386291688a (patch) | |
| tree | ed1c52d223b76837b036109869ab040304dfd218 | |
| parent | caf86a73eab4132f870e883216850d9eee40b04b (diff) | |
ARM: zynq: Rename 'zynq_platform_cpu_die'
Match the naming pattern of all other SMP ops and rename
zynq_platform_cpu_die --> zynq_cpu_die.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| -rw-r--r-- | arch/arm/mach-zynq/platsmp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index f722b5a83a45..52d768ff7857 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c | |||
| @@ -137,12 +137,14 @@ static int zynq_cpu_kill(unsigned cpu) | |||
| 137 | return 1; | 137 | return 1; |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | /* | 140 | /** |
| 141 | * platform-specific code to shutdown a CPU | 141 | * zynq_cpu_die - Let a CPU core die |
| 142 | * @cpu: Dying CPU | ||
| 142 | * | 143 | * |
| 143 | * Called with IRQs disabled | 144 | * Platform-specific code to shutdown a CPU. |
| 145 | * Called with IRQs disabled on the dying CPU. | ||
| 144 | */ | 146 | */ |
| 145 | static void zynq_platform_cpu_die(unsigned int cpu) | 147 | static void zynq_cpu_die(unsigned int cpu) |
| 146 | { | 148 | { |
| 147 | zynq_slcr_cpu_state_write(cpu, true); | 149 | zynq_slcr_cpu_state_write(cpu, true); |
| 148 | 150 | ||
| @@ -162,7 +164,7 @@ struct smp_operations zynq_smp_ops __initdata = { | |||
| 162 | .smp_boot_secondary = zynq_boot_secondary, | 164 | .smp_boot_secondary = zynq_boot_secondary, |
| 163 | .smp_secondary_init = zynq_secondary_init, | 165 | .smp_secondary_init = zynq_secondary_init, |
| 164 | #ifdef CONFIG_HOTPLUG_CPU | 166 | #ifdef CONFIG_HOTPLUG_CPU |
| 165 | .cpu_die = zynq_platform_cpu_die, | 167 | .cpu_die = zynq_cpu_die, |
| 166 | .cpu_kill = zynq_cpu_kill, | 168 | .cpu_kill = zynq_cpu_kill, |
| 167 | #endif | 169 | #endif |
| 168 | }; | 170 | }; |
