Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 566e6dfa authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Ingo Molnar
Browse files

clocksource/drivers/arm_arch_timer: Rename 'arch_timer_probed()' to... 


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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarSudeep 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: default avatarIngo Molnar <mingo@kernel.org>
parent 4806c87f

drivers/clocksource/arm_arch_timer.c

+6 −6
Original line number Diff line number Diff line
@@ -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_probing(int type, const struct of_device_id *matches)

{

	struct device_node *dn;

	bool probed = true;

	bool needs_probing = false;



	dn = of_find_matching_node(NULL, matches);

	if (dn && of_device_is_available(dn) && !(arch_timers_present & type))

		probed = false;

		needs_probing = true;

	of_node_put(dn);



	return probed;

	return needs_probing;

}



static void __init arch_timer_common_init(void)
@@ -680,9 +680,9 @@ 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_probing(ARCH_MEM_TIMER, arch_timer_mem_of_match))

			return;

		if (!arch_timer_probed(ARCH_CP15_TIMER, arch_timer_of_match))

		if (arch_timer_needs_probing(ARCH_CP15_TIMER, arch_timer_of_match))

			return;

	}