aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2016-03-20 14:41:29 +0000
committerJohn Crispin <blogic@openwrt.org>2016-03-20 14:41:29 +0000
commit1d87c4d814a6703e1eb9f37e64a342647b6ec70d (patch)
treee794ebc92d8b69857b1ea2ca10289e6bac98e7dd /target/linux/oxnas
parentb9eb591be55e3c29b2207a3a0e84baa039c11d31 (diff)
downloadmaster-187ad058-1d87c4d814a6703e1eb9f37e64a342647b6ec70d.tar.gz
master-187ad058-1d87c4d814a6703e1eb9f37e64a342647b6ec70d.tar.bz2
master-187ad058-1d87c4d814a6703e1eb9f37e64a342647b6ec70d.zip
oxnas: sync cpu-hotplug with mach-realview
Make mach-oxnas/hotplug.c look more similar to mach-realview/hotplug.c, just cosmetics and maintainability concerns, no functional changes. Signed-off-by: Daniel Golle <daniel@makrotopia.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49044 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c b/target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c
index 861beee7b3..e3c9cb5db7 100644
--- a/target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c
+++ b/target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c
@@ -14,7 +14,6 @@
#include <asm/cp15.h>
#include <asm/smp_plat.h>
-#include <mach/smp.h>
static inline void cpu_enter_lowpower(void)
{
@@ -41,7 +40,7 @@ static inline void cpu_leave_lowpower(void)
{
unsigned int v;
- asm volatile("mrc p15, 0, %0, c1, c0, 0\n"
+ 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"
@@ -68,7 +67,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
:
: "memory", "cc");
- if (read_pen_release() == cpu_logical_map(cpu)) {
+ if (pen_release == cpu_logical_map(cpu)) {
/*
* OK, proper wakeup, we're done
*/
@@ -91,7 +90,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
*
* Called with IRQs disabled
*/
-void __ref ox820_cpu_die(unsigned int cpu)
+void ox820_cpu_die(unsigned int cpu)
{
int spurious = 0;