redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

sound: sys_timer: indent poll_def_tmr() correctly 

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 <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
hifive-unleashed-5.1
Dan Carpenter 2015-02-25 16:27:10 +03:00 committed by Takashi Iwai
parent 72f770c6ac
commit 19449593d6
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sound/oss/sys_timer.c
View File

@ -50,29 +50,24 @@ tmr2ticks(int tmr_value)
static void static void
poll_def_tmr(unsigned long dummy) poll_def_tmr(unsigned long dummy)
{ {
if (!opened)
return;
def_tmr.expires = (1) + jiffies;
add_timer(&def_tmr);
if (opened) if (!tmr_running)
{ return;
{ spin_lock(&lock);
def_tmr.expires = (1) + jiffies; tmr_ctr++;
add_timer(&def_tmr); curr_ticks = ticks_offs + tmr2ticks(tmr_ctr);
}
if (tmr_running) if (curr_ticks >= next_event_time) {
{ next_event_time = (unsigned long) -1;
spin_lock(&lock); sequencer_timer(0);
tmr_ctr++; }
curr_ticks = ticks_offs + tmr2ticks(tmr_ctr);
if (curr_ticks >= next_event_time) spin_unlock(&lock);
{
next_event_time = (unsigned long) -1;
sequencer_timer(0);
}
spin_unlock(&lock);
}
}
} }
static void static void