Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-01 00:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: shmobile: Remove emev2_get_core_count()

Browse Source 
Reduce the number of lines of code in smp-emev2.c
by getting rid of the emev2_get_core_count() function.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Magnus Damm 2013-02-13 00:45:34 +09:00 committed by Simon Horman
parent 0ae56a951d
commit 2f747dbab4
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/mach-shmobile/smp-emev2.c
View File

@ -50,18 +50,6 @@ static void modify_scu_cpu_psr(unsigned long set, unsigned long clr)
} }
static unsigned int __init emev2_get_core_count(void)
{
if (!scu_base) {
scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);
emev2_clock_init(); /* need ioremapped SMU */
}
WARN_ON_ONCE(!scu_base);
return scu_base ? scu_get_core_count(scu_base) : 1;
}
static void __cpuinit emev2_secondary_init(unsigned int cpu) static void __cpuinit emev2_secondary_init(unsigned int cpu)
{ {
gic_secondary_init(0); gic_secondary_init(0);
@ -93,7 +81,14 @@ static void __init emev2_smp_prepare_cpus(unsigned int max_cpus)
static void __init emev2_smp_init_cpus(void) static void __init emev2_smp_init_cpus(void)
{ {
unsigned int ncores = emev2_get_core_count(); unsigned int ncores;
if (!scu_base) {
scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);
emev2_clock_init(); /* need ioremapped SMU */
}
ncores = scu_base ? scu_get_core_count(scu_base) : 1;
shmobile_smp_init_cpus(ncores); shmobile_smp_init_cpus(ncores);
} }