Hi Mans, On ven., oct. 09 2015, Mans Rullgard <m...@mansr.com> wrote:
> This passes a data pointer specified in the sched_clock_register() > call to the read callback allowing simpler implementations thereof. > > In this patch, existing uses of this interface are simply updated > with a null pointer. > > Signed-off-by: Mans Rullgard <m...@mansr.com> > --- [...] > diff --git a/drivers/clocksource/time-armada-370-xp.c > b/drivers/clocksource/time-armada-370-xp.c > index 2162796..a13b73b 100644 > --- a/drivers/clocksource/time-armada-370-xp.c > +++ b/drivers/clocksource/time-armada-370-xp.c > @@ -92,7 +92,7 @@ static void local_timer_ctrl_clrset(u32 clr, u32 set) > local_base + TIMER_CTRL_OFF); > } > > -static u64 notrace armada_370_xp_read_sched_clock(void) > +static u64 notrace armada_370_xp_read_sched_clock(void *data) > { > return ~readl(timer_base + TIMER0_VAL_OFF); > } > @@ -290,7 +290,8 @@ static void __init armada_370_xp_timer_common_init(struct > device_node *np) > /* > * Set scale and timer for sched_clock. > */ > - sched_clock_register(armada_370_xp_read_sched_clock, 32, timer_clk); > + sched_clock_register(armada_370_xp_read_sched_clock, 32, timer_clk, > + NULL); > > clocksource_mmio_init(timer_base + TIMER0_VAL_OFF, > "armada_370_xp_clocksource", For the time-armada-370-xp.c file: Acked-by: Gregory CLEMENT <gregory.clem...@free-electrons.com> Thanks, Gregory -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html