android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: zynq: hotplug: Remove unreachable code

Browse Source 
zynq_platform_do_lowpower() does never return. Hence remove
all code which relies on that function returning and consolidate the
remains.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Soren Brinkmann 2013-08-01 09:36:53 -07:00 committed by Michal Simek
parent 3db9e86029
commit b522877b53
1 changed files with 5 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
arch/arm/mach-zynq/hotplug.c
View File

@ -40,44 +40,6 @@ static inline void zynq_cpu_enter_lowpower(void)
: "cc"); : "cc");
} }
static inline void zynq_cpu_leave_lowpower(void)
{
unsigned int v;
asm volatile(
" mrc p15, 0, %0, c1, c0, 0\n"
" orr %0, %0, %1\n"
" mcr p15, 0, %0, c1, c0, 0\n"
" mrc p15, 0, %0, c1, c0, 1\n"
" orr %0, %0, #0x40\n"
" mcr p15, 0, %0, c1, c0, 1\n"
: "=&r" (v)
: "Ir" (CR_C)
: "cc");
}
static inline void zynq_platform_do_lowpower(unsigned int cpu, int *spurious)
{
/*
* there is no power-control hardware on this platform, so all
* we can do is put the core into WFI; this is safe as the calling
* code will have already disabled interrupts
*/
for (;;) {
dsb();
wfi();
/*
* Getting here, means that we have come out of WFI without
* having been woken up - this shouldn't happen
*
* Just note it happening - when we're woken, we can report
* its occurrence.
*/
(*spurious)++;
}
}
/* /*
* platform-specific code to shutdown a CPU * platform-specific code to shutdown a CPU
* *
@ -85,20 +47,13 @@ static inline void zynq_platform_do_lowpower(unsigned int cpu, int *spurious)
*/ */
void zynq_platform_cpu_die(unsigned int cpu) void zynq_platform_cpu_die(unsigned int cpu)
{ {
int spurious = 0;
/*
* we're ready for shutdown now, so do it
*/
zynq_cpu_enter_lowpower(); zynq_cpu_enter_lowpower();
zynq_platform_do_lowpower(cpu, &spurious);
/* /*
* bring this CPU back into the world of cache * there is no power-control hardware on this platform, so all
* coherency, and then restore interrupts * we can do is put the core into WFI; this is safe as the calling
* code will have already disabled interrupts
*/ */
zynq_cpu_leave_lowpower(); for (;;)
cpu_do_idle();
if (spurious)
pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious);
} }