ARC: arc_local_timer_setup() need not pass own cpu id

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>

3 files changed, 8 insertions, 7 deletions

diff --git a/arch/arc/include/asm/irq.h b/arch/arc/include/asm/irq.h
index 781f57f25bd8..fb4efb648971 100644
--- a/arch/arc/include/asm/irq.h
+++ b/arch/arc/include/asm/irq.h
@@ -19,6 +19,6 @@
 #include <asm-generic/irq.h>
 
 extern void arc_init_IRQ(void);
-void arc_local_timer_setup(unsigned int cpu);
+void arc_local_timer_setup(void);
 
 #endif
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c
index 40859e5619f9..cf90b6f4d3e0 100644
--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -138,7 +138,7 @@ void start_kernel_secondary(void)
         if (machine_desc->init_smp)
                 machine_desc->init_smp(smp_processor_id());
 
-        arc_local_timer_setup(cpu);
+        arc_local_timer_setup();
 
         local_irq_enable();
         preempt_disable();
diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index 71c42521c77f..36c2aa99436f 100644
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -219,12 +219,13 @@ static struct irqaction arc_timer_irq = {
 /*
  * Setup the local event timer for @cpu
  */
-void arc_local_timer_setup(unsigned int cpu)
+void arc_local_timer_setup()
 {
-        struct clock_event_device *clk = &per_cpu(arc_clockevent_device, cpu);
+        struct clock_event_device *evt = this_cpu_ptr(&arc_clockevent_device);
+        int cpu = smp_processor_id();
 
-        clk->cpumask = cpumask_of(cpu);
-        clockevents_config_and_register(clk, arc_get_core_freq(),
+        evt->cpumask = cpumask_of(cpu);
+        clockevents_config_and_register(evt, arc_get_core_freq(),
                                         0, ARC_TIMER_MAX);
 
         /*
@@ -261,7 +262,7 @@ void __init time_init(void)
                 clocksource_register_hz(&arc_counter, arc_get_core_freq());
 
         /* sets up the periodic event timer */
-        arc_local_timer_setup(smp_processor_id());
+        arc_local_timer_setup();
 
         if (machine_desc->init_time)
                 machine_desc->init_time();