aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2015-03-31 06:12:22 -0400
committerIngo Molnar <mingo@kernel.org>2015-03-31 11:53:57 -0400
commit566e6dfad580a55084c29fe3e887c7273b16fc6a (patch)
tree55dafb5020fdb22b27be2400902d48f4ed1ae02b
parent4806c87f017d8a7003ad34886f58c3b9e023df6a (diff)
clocksource/drivers/arm_arch_timer: Rename 'arch_timer_probed()' to 'arch_timer_needs_probing()' to reflect behaviour
The arch_timer_probed() function returns whether the given time doesn't need to be probed. This can be the case when the timer has been probed already, but also when it has no corresponding enabled node in DT. Rename the function to arch_timer_needs_probing() and invert its return value to better reflect the function's purpose and behaviour. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1427796746-373-1-git-send-email-daniel.lezcano@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--drivers/clocksource/arm_arch_timer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index a3025e7ae35f..266469691e58 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -661,17 +661,17 @@ static const struct of_device_id arch_timer_mem_of_match[] __initconst = {
661}; 661};
662 662
663static bool __init 663static bool __init
664arch_timer_probed(int type, const struct of_device_id *matches) 664arch_timer_needs_probing(int type, const struct of_device_id *matches)
665{ 665{
666 struct device_node *dn; 666 struct device_node *dn;
667 bool probed = true; 667 bool needs_probing = false;
668 668
669 dn = of_find_matching_node(NULL, matches); 669 dn = of_find_matching_node(NULL, matches);
670 if (dn && of_device_is_available(dn) && !(arch_timers_present & type)) 670 if (dn && of_device_is_available(dn) && !(arch_timers_present & type))
671 probed = false; 671 needs_probing = true;
672 of_node_put(dn); 672 of_node_put(dn);
673 673
674 return probed; 674 return needs_probing;
675} 675}
676 676
677static void __init arch_timer_common_init(void) 677static void __init arch_timer_common_init(void)
@@ -680,9 +680,9 @@ static void __init arch_timer_common_init(void)
680 680
681 /* Wait until both nodes are probed if we have two timers */ 681 /* Wait until both nodes are probed if we have two timers */
682 if ((arch_timers_present & mask) != mask) { 682 if ((arch_timers_present & mask) != mask) {
683 if (!arch_timer_probed(ARCH_MEM_TIMER, arch_timer_mem_of_match)) 683 if (arch_timer_needs_probing(ARCH_MEM_TIMER, arch_timer_mem_of_match))
684 return; 684 return;
685 if (!arch_timer_probed(ARCH_CP15_TIMER, arch_timer_of_match)) 685 if (arch_timer_needs_probing(ARCH_CP15_TIMER, arch_timer_of_match))
686 return; 686 return;
687 } 687 }
688 688