sound: sys_timer: indent poll_def_tmr() correctly
Subsystems (2)
PATCH 1/1 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 <[email protected]>
sound/oss/sys_timer.c +15 -20
@@ -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
Takashi Iwai
AppliedAt Wed, 25 Feb 2015 16:27:10 +0300,
Quoted 6 lines · Dan Carpenter
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 <[email protected]>
Applied, thanks.
Takashi
Quoted 51 lines
sound/oss/sys_timer.c +15
-20@@ -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