aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorHumberto Borba <humberos@gmail.com>2013-05-07 11:12:43 -0300
committerChirayu Desai <chirayudesai1@gmail.com>2013-05-07 21:26:56 +0530
commit4f41c27189dcb51277659f34e3afb23120c3692b (patch)
treecbcdaf4fe3c12ed5155ae8ff181127f90d0fbe04 /arch/arm
parent959743c3f4896dd1b1ee186339ee2fc07404808a (diff)
downloadkernel_samsung_aries-4f41c27189dcb51277659f34e3afb23120c3692b.zip
kernel_samsung_aries-4f41c27189dcb51277659f34e3afb23120c3692b.tar.gz
kernel_samsung_aries-4f41c27189dcb51277659f34e3afb23120c3692b.tar.bz2
arm: s5pv210: p1: replace preprocessor directives with function calls
* replaces #if(n)def CONFIG_MACH_P1 with machine_is_p1() Signed-off-by: Humberto Borba <humberos@gmail.com> Change-Id: I100010800dcd1e78439234539dd127b1231ffac4
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s5pv210/cpu.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 7be2fb7..ddbd0b3 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -131,12 +131,10 @@ static void s5pv210_idle(void)
local_irq_enable();
}
-#ifndef CONFIG_MACH_P1
static void s5pv210_sw_reset(void)
{
__raw_writel(0x1, S5P_SWRESET);
}
-#endif
/* s5pv210_map_io
*
@@ -217,10 +215,9 @@ int __init s5pv210_init(void)
/* set idle function */
pm_idle = s5pv210_idle;
-#ifndef CONFIG_MACH_P1
/* set sw_reset function */
- if (!(machine_is_herring() || machine_is_aries()))
+ if (!(machine_is_herring() || machine_is_aries() || machine_is_p1()))
s5p_reset_hook = s5pv210_sw_reset;
-#endif
+
return sysdev_register(&s5pv210_sysdev);
}