linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de, mingo@kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
	Sudeep Holla <sudeep.holla@arm.com>
Subject: [PATCH 1/5] clocksource/drivers/arm_arch_timer: Rename arch_timer_probed to reflect behaviour
Date: Tue, 31 Mar 2015 12:12:22 +0200	[thread overview]
Message-ID: <1427796746-373-1-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <551A72B6.7030106@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_needs_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..26acfb5 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_needs_probe(int type, const struct of_device_id *matches)
 {
 	struct device_node *dn;
-	bool probed = true;
+	bool needs_probe = false;
 
 	dn = of_find_matching_node(NULL, matches);
 	if (dn && of_device_is_available(dn) && !(arch_timers_present & type))
-		probed = false;
+		needs_probe = true;
 	of_node_put(dn);
 
-	return probed;
+	return needs_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_needs_probe(ARCH_MEM_TIMER,
+					  arch_timer_mem_of_match))
 			return;
-		if (!arch_timer_probed(ARCH_CP15_TIMER, arch_timer_of_match))
+		if (arch_timer_needs_probe(ARCH_CP15_TIMER, arch_timer_of_match))
 			return;
 	}
 
-- 
1.9.1


  reply	other threads:[~2015-03-31 10:13 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-31 10:11 [GIT PULL] clockevents for 4.1 #2 Daniel Lezcano
2015-03-31 10:12 ` Daniel Lezcano [this message]
2015-03-31 10:12   ` [PATCH 2/5] clocksource/drivers/sun5i: Switch to request_irq Daniel Lezcano
2015-04-01  5:28     ` [tip:timers/core] clocksource/drivers/sun5i: Switch to request_irq() tip-bot for Maxime Ripard
2015-03-31 10:12   ` [PATCH 3/5] clocksource/drivers/sun5i: Use of_io_request_and_map Daniel Lezcano
2015-04-01  5:28     ` [tip:timers/core] clocksource/drivers/sun5i: Use of_io_request_and_map() tip-bot for Maxime Ripard
2015-03-31 10:12   ` [PATCH 4/5] clocksource/drivers/sun5i: Refactor the current code Daniel Lezcano
2015-04-01  5:28     ` [tip:timers/core] " tip-bot for Maxime Ripard
2015-03-31 10:12   ` [PATCH 5/5] clocksource/drivers/sun5i: Add clock notifiers Daniel Lezcano
2015-04-01  5:28     ` [tip:timers/core] " tip-bot for Maxime Ripard
2015-04-01  5:27   ` [tip:timers/core] clocksource/drivers/arm_arch_timer: Rename ' arch_timer_probed()' to 'arch_timer_needs_probing()' to reflect behaviour tip-bot for Laurent Pinchart

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=1427796746-373-1-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=laurent.pinchart+renesas@ideasonboard.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=sudeep.holla@arm.com \
    --cc=tglx@linutronix.de \
    --subject='Re: [PATCH 1/5] clocksource/drivers/arm_arch_timer: Rename arch_timer_probed to reflect behaviour' \
    /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

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox