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

Commit ef201de4 authored by Mark Rutland's avatar Mark Rutland
Browse files

arm: arch_timer: remove redundant available check 



This check is a holdover from the pre-devicetree days. As the timer
is not probed except by platforms which register it via devicetree,
it's not strictly necessary.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 2b55d10c

arch/arm/kernel/arch_timer.c

+0 −12
Original line number Diff line number Diff line
@@ -20,11 +20,9 @@ 
#include <linux/of_irq.h>

#include <linux/io.h>



#include <asm/cputype.h>

#include <asm/delay.h>

#include <asm/localtimer.h>

#include <asm/arch_timer.h>

#include <asm/system_info.h>

#include <asm/sched_clock.h>



static unsigned long arch_timer_rate;
@@ -259,20 +257,10 @@ static int __cpuinit arch_timer_setup(struct clock_event_device *clk) 
	return 0;

}



/* Is the optional system timer available? */

static int local_timer_is_architected(void)

{

	return (cpu_architecture() >= CPU_ARCH_ARMv7) &&

	       ((read_cpuid_ext(CPUID_EXT_PFR1) >> 16) & 0xf) == 1;

}



static int arch_timer_available(void)

{

	unsigned long freq;



	if (!local_timer_is_architected())

		return -ENXIO;



	if (arch_timer_rate == 0) {

		freq = arch_timer_reg_read(ARCH_TIMER_PHYS_ACCESS,

					   ARCH_TIMER_REG_FREQ);