Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f747dba authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Remove emev2_get_core_count() 



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

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 0ae56a95

arch/arm/mach-shmobile/smp-emev2.c

+8 −13
Original line number Diff line number Diff line
@@ -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)

{

	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)

{

	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);

}