On Thu, May 21, 2015 at 3:25 PM, Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxx> wrote: > > > On 05/21/2015 07:24 PM, Andrew Bresticker wrote: >> On Thu, May 21, 2015 at 2:37 PM, Ezequiel Garcia >> <ezequiel.garcia@xxxxxxxxxx> wrote: >>> This is preparation work for the introduction of clockevent frequency >>> update with a clock notifier. This is only possible when the device >>> is passed a clk struct, so let's split the legacy and devicetree >>> initialization. >>> >>> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxx> >>> --- >>> drivers/clocksource/mips-gic-timer.c | 13 ++++++++----- >>> 1 file changed, 8 insertions(+), 5 deletions(-) >>> >>> diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c >>> index c4352f0..22a4daf 100644 >>> --- a/drivers/clocksource/mips-gic-timer.c >>> +++ b/drivers/clocksource/mips-gic-timer.c >>> @@ -142,11 +142,6 @@ static void __init __gic_clocksource_init(void) >>> ret = clocksource_register_hz(&gic_clocksource, gic_frequency); >>> if (ret < 0) >>> pr_warn("GIC: Unable to register clocksource\n"); >>> - >>> - gic_clockevent_init(); >>> - >>> - /* And finally start the counter */ >>> - gic_start_count(); >>> } >> >> Instead of duplicating this bit in both the OF and non-OF paths, maybe >> it would be better to do the notifier registration in >> gic_clockevent_init(), either by passing around the struct clk or >> making it a global? >> > > Yeah, I had something like that first, but somehow it looked ugly to have: > > gic_clockevent_init(IS_ERR(clk) ? NULL : clk); > > Don't have a strong opinion though. Ah that is a bit ugly. I'm fine either way though, so: Reviewed-by: Andrew Bresticker <abrestic@xxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html