aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatt Redfearn <matt.redfearn@mips.com>2017-10-19 07:55:34 -0400
committerDaniel Lezcano <daniel.lezcano@linaro.org>2017-10-19 17:49:45 -0400
commit7957b07b559175500b2a03e8a39738c1b4a832fe (patch)
tree6c89968c1f43021bcbab946c768facbbd23dc956 /drivers
parenta7fb4577bbe307dd3dd971c7ea8f35a68fc031ca (diff)
clocksource/drivers/mips-gic-timer: Remove pointless irq_save,restore
The function gic_next_event is always called with interrupts disabled, so the local_irq_save / local_irq_restore are pointless - remove them. [Daniel Lezcano: Fixed warning by removing unused variable 'flags'] Signed-off-by: Matt Redfearn <matt.redfearn@mips.com> Suggested-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reported-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clocksource/mips-gic-timer.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index ae3167c28b12..775dea04460d 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -39,16 +39,13 @@ static u64 notrace gic_read_count(void)
39 39
40static int gic_next_event(unsigned long delta, struct clock_event_device *evt) 40static int gic_next_event(unsigned long delta, struct clock_event_device *evt)
41{ 41{
42 unsigned long flags;
43 u64 cnt; 42 u64 cnt;
44 int res; 43 int res;
45 44
46 cnt = gic_read_count(); 45 cnt = gic_read_count();
47 cnt += (u64)delta; 46 cnt += (u64)delta;
48 local_irq_save(flags);
49 write_gic_vl_other(mips_cm_vp_id(cpumask_first(evt->cpumask))); 47 write_gic_vl_other(mips_cm_vp_id(cpumask_first(evt->cpumask)));
50 write_gic_vo_compare(cnt); 48 write_gic_vo_compare(cnt);
51 local_irq_restore(flags);
52 res = ((int)(gic_read_count() - cnt) >= 0) ? -ETIME : 0; 49 res = ((int)(gic_read_count() - cnt) >= 0) ? -ETIME : 0;
53 return res; 50 return res;
54} 51}