From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 20 Oct 2008 11:38:11 +0000 (+0200)
Subject: hrtimers: simplify hrtimer_peek_ahead_timers()
X-Git-Tag: v2.6.28-rc1~18^2^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=643bdf68f92a8516574ed7ca3713f9334c331b8d;p=linux-2.6-omap-h63xx.git

hrtimers: simplify hrtimer_peek_ahead_timers()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 00e6f0a1e7a..4fc41414fc0 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1394,22 +1394,16 @@ void hrtimer_interrupt(struct clock_event_device *dev)
  */
 void hrtimer_peek_ahead_timers(void)
 {
-	unsigned long flags;
 	struct tick_device *td;
-	struct clock_event_device *dev;
+	unsigned long flags;
 
 	if (!hrtimer_hres_active())
 		return;
 
 	local_irq_save(flags);
 	td = &__get_cpu_var(tick_cpu_device);
-	if (!td)
-		goto out;
-	dev = td->evtdev;
-	if (!dev)
-		goto out;
-	hrtimer_interrupt(dev);
-out:
+	if (td && td->evtdev)
+		hrtimer_interrupt(td->evtdev);
 	local_irq_restore(flags);
 }