All of lore.kernel.org
 help / color / mirror / Atom feed
From: Viresh Kumar <viresh.kumar@linaro.org>
To: tglx@linutronix.de
Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org,
	fweisbec@gmail.com, linaro-networking@linaro.org,
	Arvind.Chauhan@arm.com, Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH 12/16] hrtimer: rewrite switch_hrtimer_base() to remove extra indentation level
Date: Fri, 28 Mar 2014 17:11:31 +0530	[thread overview]
Message-ID: <b56d3fcdc21abee9d394b8045413ed032d85abf2.1396006658.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1396006658.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1396006658.git.viresh.kumar@linaro.org>

Complete bottom part of switch_hrtimer_base() is part of a 'if' block and so all
code present in that block has extra indentation level before it. Rewrite it to
remove this extra indentation level.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 kernel/hrtimer.c | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 04f8e44..30efa1c 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -203,33 +203,33 @@ again:
 	new_cpu_base = &per_cpu(hrtimer_bases, cpu);
 	new_base = &new_cpu_base->clock_base[base->index];
 
-	if (base != new_base) {
-		/*
-		 * We are trying to move timer to new_base.
-		 * However we can't change timer's base while it is running,
-		 * so we keep it on the same CPU. No hassle vs. reprogramming
-		 * the event source in the high resolution case. The softirq
-		 * code will take care of this when the timer function has
-		 * completed. There is no conflict as we hold the lock until
-		 * the timer is enqueued.
-		 */
-		if (unlikely(hrtimer_callback_running(timer)))
-			return;
+	if (base == new_base)
+		return;
 
-		/* See the comment in lock_timer_base() */
-		timer->base = NULL;
-		raw_spin_unlock(&base->cpu_base->lock);
-		raw_spin_lock(&new_base->cpu_base->lock);
+	/*
+	 * We are trying to move timer to new_base. However we can't change
+	 * timer's base while it is running, so we keep it on the same CPU. No
+	 * hassle vs. reprogramming the event source in the high resolution
+	 * case. The softirq code will take care of this when the timer function
+	 * has completed. There is no conflict as we hold the lock until the
+	 * timer is enqueued.
+	 */
+	if (unlikely(hrtimer_callback_running(timer)))
+		return;
 
-		if (cpu != this_cpu && hrtimer_check_target(timer, new_base)) {
-			cpu = this_cpu;
-			raw_spin_unlock(&new_base->cpu_base->lock);
-			raw_spin_lock(&base->cpu_base->lock);
-			timer->base = base;
-			goto again;
-		}
-		timer->base = new_base;
+	/* See the comment in lock_timer_base() */
+	timer->base = NULL;
+	raw_spin_unlock(&base->cpu_base->lock);
+	raw_spin_lock(&new_base->cpu_base->lock);
+
+	if (cpu != this_cpu && hrtimer_check_target(timer, new_base)) {
+		cpu = this_cpu;
+		raw_spin_unlock(&new_base->cpu_base->lock);
+		raw_spin_lock(&base->cpu_base->lock);
+		timer->base = base;
+		goto again;
 	}
+	timer->base = new_base;
 }
 
 #else /* CONFIG_SMP */
-- 
1.7.12.rc2.18.g61b472e


  parent reply	other threads:[~2014-03-28 11:43 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-28 11:41 [PATCH 00/16] timers/hrtimers: Minor cleanups: Part II Viresh Kumar
2014-03-28 11:41 ` [PATCH 01/16] hrtimer: move unlock_hrtimer_base() upwards Viresh Kumar
2014-03-28 11:41 ` [PATCH 02/16] hrtimer: reorder code in __remove_hrtimer() Viresh Kumar
2014-04-02  5:41   ` Viresh Kumar
2014-03-28 11:41 ` [PATCH 03/16] hrtimer: Create hrtimer_get_monoexpires() Viresh Kumar
2014-03-28 11:41 ` [PATCH 04/16] hrtimer: remove 'base' parameter from remove_timer() and __remove_timer() Viresh Kumar
2014-03-28 11:41 ` [PATCH 05/16] hrtimer: remove 'base' parameter from switch_hrtimer_base() Viresh Kumar
2014-03-28 11:41 ` [PATCH 06/16] hrtimer: remove 'base' parameter from enqueue_hrtimer() Viresh Kumar
2014-03-28 11:41 ` [PATCH 07/16] hrtimer: remove 'base' parameter from hrtimer_{enqueue_}reprogram() Viresh Kumar
2014-03-28 11:41 ` [PATCH 08/16] hrtimer: make switch_hrtimer_base() return void Viresh Kumar
2014-03-28 11:41 ` [PATCH 09/16] hrtimer: make lock_hrtimer_base() " Viresh Kumar
2014-03-28 11:41 ` [PATCH 10/16] hrtimer: make enqueue_hrtimer() " Viresh Kumar
2014-03-28 11:41 ` [PATCH 11/16] hrtimer: don't check if timer is queued in __remove_hrtimer() Viresh Kumar
2014-03-28 11:41 ` Viresh Kumar [this message]
2014-03-28 11:41 ` [PATCH 13/16] hrtimer: rewrite remove_hrtimer() to remove extra indentation level Viresh Kumar
2014-03-28 11:41 ` [PATCH 14/16] hrtimer: replace base by new_base to get resolution: __hrtimer_start_range_ns() Viresh Kumar
2014-03-28 11:41 ` [PATCH 15/16] hrtimer: create base_on_this_cpu() Viresh Kumar
2014-03-28 11:41 ` [PATCH 16/16] hrtimer: use base->hres_active directly instead of hrtimer_hres_active() Viresh Kumar
2014-03-28 12:24   ` Viresh Kumar
2014-03-28 12:26   ` [PATCH V2 " Viresh Kumar
2014-03-31 13:38 ` [PATCH 00/16] timers/hrtimers: Minor cleanups: Part II Thomas Gleixner
2014-03-31 14:31   ` Viresh Kumar
2014-03-31 15:51     ` Thomas Gleixner
2014-04-01  6:33   ` Viresh Kumar
2014-04-01  7:02     ` Viresh Kumar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b56d3fcdc21abee9d394b8045413ed032d85abf2.1396006658.git.viresh.kumar@linaro.org \
    --to=viresh.kumar@linaro.org \
    --cc=Arvind.Chauhan@arm.com \
    --cc=fweisbec@gmail.com \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linaro-networking@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.