linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/11] clocksource: arm_arch_timer: Rename arch_timer_probed to reflect behaviour
Date: Mon, 30 Mar 2015 22:17:03 +0200	[thread overview]
Message-ID: <1427746633-9137-1-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <5519AEB2.8050306@linaro.org>

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

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_need_probe and invert its return value
to better reflect the function's purpose and behaviour.

Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/arm_arch_timer.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index a3025e7..50bb7f2 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 = {
 };
 
 static bool __init
-arch_timer_probed(int type, const struct of_device_id *matches)
+arch_timer_need_probe(int type, const struct of_device_id *matches)
 {
 	struct device_node *dn;
-	bool probed = true;
+	bool need_probe = false;
 
 	dn = of_find_matching_node(NULL, matches);
 	if (dn && of_device_is_available(dn) && !(arch_timers_present & type))
-		probed = false;
+		need_probe = true;
 	of_node_put(dn);
 
-	return probed;
+	return need_probe;
 }
 
 static void __init arch_timer_common_init(void)
@@ -680,9 +680,10 @@ static void __init arch_timer_common_init(void)
 
 	/* Wait until both nodes are probed if we have two timers */
 	if ((arch_timers_present & mask) != mask) {
-		if (!arch_timer_probed(ARCH_MEM_TIMER, arch_timer_mem_of_match))
+		if (arch_timer_need_probe(ARCH_MEM_TIMER,
+					  arch_timer_mem_of_match))
 			return;
-		if (!arch_timer_probed(ARCH_CP15_TIMER, arch_timer_of_match))
+		if (arch_timer_need_probe(ARCH_CP15_TIMER, arch_timer_of_match))
 			return;
 	}
 
-- 
1.9.1

  reply	other threads:[~2015-03-30 20:17 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-30 20:14 [GIT PULL] clockevents for 4.1 Daniel Lezcano
2015-03-30 20:17 ` Daniel Lezcano [this message]
2015-03-30 20:17   ` [PATCH 02/11] clocksource: sun5i: Switch to request_irq Daniel Lezcano
2015-03-30 20:17   ` [PATCH 03/11] clocksource: sun5i: Use of_io_request_and_map Daniel Lezcano
2015-03-30 20:17   ` [PATCH 04/11] clocksource: sun5i: Remove sched_clock Daniel Lezcano
2015-03-30 20:17   ` [PATCH 05/11] clocksource: sun5i: Refactor the current code Daniel Lezcano
2015-03-30 20:17   ` [PATCH 06/11] clocksource: sun5i: Add clock notifiers Daniel Lezcano
2015-03-30 20:17   ` [PATCH 07/11] clocksource: at91: Make IO endian agnostic Daniel Lezcano
2015-03-30 20:17   ` [PATCH 08/11] clocksource: sun4i-timer: Only register a sched_clock on sun4i and sun5i Daniel Lezcano
2015-03-30 20:17   ` [PATCH 09/11] clocksource: tegra: Maintain CPU endianness Daniel Lezcano
2015-03-30 20:17   ` [PATCH 10/11] clocksource: dw_apb_timer_of: Make IO endian agnostic Daniel Lezcano
2015-03-30 20:17   ` [PATCH 11/11] clocksource: efm32: Use CLOCK_EVT_FEAT_PERIODIC for defining features Daniel Lezcano
2015-03-31  7:14   ` [PATCH 01/11] clocksource: arm_arch_timer: Rename arch_timer_probed to reflect behaviour Ingo Molnar
2015-03-31 14:14     ` Laurent Pinchart
2015-03-31 15:49       ` Ingo Molnar
2015-03-31  7:17 ` [GIT PULL] clockevents for 4.1 Ingo Molnar
2015-03-31  9:37   ` Daniel Lezcano
2015-03-31  9:42     ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1427746633-9137-1-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).