sound: sys_timer: indent poll_def_tmr() correctly

Commit Message

Dan Carpenter Feb. 25, 2015, 1:27 p.m. UTC

The indenting here was really whacky and not consistent from one line to
the next.  I also reverse the "if (opened)" and "if (tmr_running)" tests
so that I could remove two indent levels.

Signed-off-by: Dan Carpenter <[e-mail]>

Comments

Takashi Iwai Feb. 25, 2015, 7:09 p.m. UTC | #1

At Wed, 25 Feb 2015 16:27:10 +0300,
Dan Carpenter wrote:
> 
> The indenting here was really whacky and not consistent from one line to
> the next.  I also reverse the "if (opened)" and "if (tmr_running)" tests
> so that I could remove two indent levels.
> 
> Signed-off-by: Dan Carpenter <[e-mail]>

Applied, thanks.


Takashi

> 
> diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c
> index 9f03983..2226dda 100644
> --- a/sound/oss/sys_timer.c
> +++ b/sound/oss/sys_timer.c
> @@ -50,29 +50,24 @@ tmr2ticks(int tmr_value)
>  static void
>  poll_def_tmr(unsigned long dummy)
>  {
> +	if (!opened)
> +		return;
> +	def_tmr.expires = (1) + jiffies;
> +	add_timer(&def_tmr);
>  
> -	if (opened)
> -	  {
> +	if (!tmr_running)
> +		return;
>  
> -		  {
> -			  def_tmr.expires = (1) + jiffies;
> -			  add_timer(&def_tmr);
> -		  }
> +	spin_lock(&lock);
> +	tmr_ctr++;
> +	curr_ticks = ticks_offs + tmr2ticks(tmr_ctr);
>  
> -		  if (tmr_running)
> -		    {
> -				spin_lock(&lock);
> -			    tmr_ctr++;
> -			    curr_ticks = ticks_offs + tmr2ticks(tmr_ctr);
> -
> -			    if (curr_ticks >= next_event_time)
> -			      {
> -				      next_event_time = (unsigned long) -1;
> -				      sequencer_timer(0);
> -			      }
> -				spin_unlock(&lock);
> -		    }
> -	  }
> +	if (curr_ticks >= next_event_time) {
> +		next_event_time = (unsigned long) -1;
> +		sequencer_timer(0);
> +	}
> +
> +	spin_unlock(&lock);
>  }
>  
>  static void
>

Patch

diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c
index 9f03983..2226dda 100644
--- a/sound/oss/sys_timer.c
+++ b/sound/oss/sys_timer.c
@@ -50,29 +50,24 @@  tmr2ticks(int tmr_value)
 static void
 poll_def_tmr(unsigned long dummy)
 {
+	if (!opened)
+		return;
+	def_tmr.expires = (1) + jiffies;
+	add_timer(&def_tmr);
 
-	if (opened)
-	  {
+	if (!tmr_running)
+		return;
 
-		  {
-			  def_tmr.expires = (1) + jiffies;
-			  add_timer(&def_tmr);
-		  }
+	spin_lock(&lock);
+	tmr_ctr++;
+	curr_ticks = ticks_offs + tmr2ticks(tmr_ctr);
 
-		  if (tmr_running)
-		    {
-				spin_lock(&lock);
-			    tmr_ctr++;
-			    curr_ticks = ticks_offs + tmr2ticks(tmr_ctr);
-
-			    if (curr_ticks >= next_event_time)
-			      {
-				      next_event_time = (unsigned long) -1;
-				      sequencer_timer(0);
-			      }
-				spin_unlock(&lock);
-		    }
-	  }
+	if (curr_ticks >= next_event_time) {
+		next_event_time = (unsigned long) -1;
+		sequencer_timer(0);
+	}
+
+	spin_unlock(&lock);
 }
 
 static void