From: Soren Brinkmann Date: Tue, 2 Sep 2014 21:19:14 +0000 (-0700) Subject: ARM: zynq: Rename 'zynq_platform_cpu_die' X-Git-Tag: firefly_0821_release~176^2~3111^2~10^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ed62e330948dea39b455d94dc14522386291688a;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Michal Simek --- 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) return 1; } -/* - * platform-specific code to shutdown a CPU +/** + * zynq_cpu_die - Let a CPU core die + * @cpu: Dying CPU * - * Called with IRQs disabled + * Platform-specific code to shutdown a CPU. + * Called with IRQs disabled on the dying CPU. */ -static void zynq_platform_cpu_die(unsigned int cpu) +static void zynq_cpu_die(unsigned int cpu) { zynq_slcr_cpu_state_write(cpu, true); @@ -162,7 +164,7 @@ struct smp_operations zynq_smp_ops __initdata = { .smp_boot_secondary = zynq_boot_secondary, .smp_secondary_init = zynq_secondary_init, #ifdef CONFIG_HOTPLUG_CPU - .cpu_die = zynq_platform_cpu_die, + .cpu_die = zynq_cpu_die, .cpu_kill = zynq_cpu_kill, #endif };