clocksource: arch_timer: Pass clock event to set_mode callback
authorStephen Boyd <sboyd@codeaurora.org>
Thu, 18 Jul 2013 23:59:30 +0000 (16:59 -0700)
committerMark Brown <broonie@linaro.org>
Fri, 13 Jun 2014 15:32:16 +0000 (16:32 +0100)
There isn't any reason why we don't pass the event here and we'll
need it in the near future for memory mapped arch timers anyway.

Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Marc Zyngier <Marc.Zyngier@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
(cherry picked from commit 1ff99ea65687d921cb71f330491ec4205c00eb9f)
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/clocksource/arm_arch_timer.c

index f72dd518070b9c79a0b9a1654e95a5318c7e2941..a91e72826f12860c035790b3fbe3c4316ef0af16 100644 (file)
@@ -140,7 +140,7 @@ static int __cpuinit arch_timer_setup(struct clock_event_device *clk)
 
        clk->cpumask = cpumask_of(smp_processor_id());
 
-       clk->set_mode(CLOCK_EVT_MODE_SHUTDOWN, NULL);
+       clk->set_mode(CLOCK_EVT_MODE_SHUTDOWN, clk);
 
        clockevents_config_and_register(clk, arch_timer_rate,
                                        0xf, 0x7fffffff);