korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 14:34:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

arm: arch_timer: remove redundant available check

Browse Source 
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: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Mark Rutland 2012-11-12 14:40:44 +00:00
parent 2b55d10c46
commit ef201de430
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/kernel/arch_timer.c
View File

@ -20,11 +20,9 @@
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/cputype.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/localtimer.h> #include <asm/localtimer.h>
#include <asm/arch_timer.h> #include <asm/arch_timer.h>
#include <asm/system_info.h>
#include <asm/sched_clock.h> #include <asm/sched_clock.h>
static unsigned long arch_timer_rate; static unsigned long arch_timer_rate;
@ -259,20 +257,10 @@ static int __cpuinit arch_timer_setup(struct clock_event_device *clk)
return 0; 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) static int arch_timer_available(void)
{ {
unsigned long freq; unsigned long freq;
if (!local_timer_is_architected())
return -ENXIO;
if (arch_timer_rate == 0) { if (arch_timer_rate == 0) {
freq = arch_timer_reg_read(ARCH_TIMER_PHYS_ACCESS, freq = arch_timer_reg_read(ARCH_TIMER_PHYS_ACCESS,
ARCH_TIMER_REG_FREQ); ARCH_TIMER_REG_FREQ);