Commit 51e9bd72 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ALSA: timer: Code cleanup

commit c3b16813 upstream.

This is a minor code cleanup without any functional changes:
- Kill keep_flag argument from _snd_timer_stop(), as all callers pass
  only it false.
- Remove redundant NULL check in _snd_timer_stop().
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e53ec492
...@@ -300,8 +300,7 @@ int snd_timer_open(struct snd_timer_instance **ti, ...@@ -300,8 +300,7 @@ int snd_timer_open(struct snd_timer_instance **ti,
return 0; return 0;
} }
static int _snd_timer_stop(struct snd_timer_instance *timeri, static int _snd_timer_stop(struct snd_timer_instance *timeri, int event);
int keep_flag, int event);
/* /*
* close a timer instance * close a timer instance
...@@ -343,7 +342,7 @@ int snd_timer_close(struct snd_timer_instance *timeri) ...@@ -343,7 +342,7 @@ int snd_timer_close(struct snd_timer_instance *timeri)
spin_unlock_irq(&timer->lock); spin_unlock_irq(&timer->lock);
mutex_lock(&register_mutex); mutex_lock(&register_mutex);
list_del(&timeri->open_list); list_del(&timeri->open_list);
if (timer && list_empty(&timer->open_list_head) && if (list_empty(&timer->open_list_head) &&
timer->hw.close) timer->hw.close)
timer->hw.close(timer); timer->hw.close(timer);
/* remove slave links */ /* remove slave links */
...@@ -483,8 +482,7 @@ int snd_timer_start(struct snd_timer_instance *timeri, unsigned int ticks) ...@@ -483,8 +482,7 @@ int snd_timer_start(struct snd_timer_instance *timeri, unsigned int ticks)
return result; return result;
} }
static int _snd_timer_stop(struct snd_timer_instance * timeri, static int _snd_timer_stop(struct snd_timer_instance *timeri, int event)
int keep_flag, int event)
{ {
struct snd_timer *timer; struct snd_timer *timer;
unsigned long flags; unsigned long flags;
...@@ -493,13 +491,11 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri, ...@@ -493,13 +491,11 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri,
return -ENXIO; return -ENXIO;
if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) { if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) {
if (!keep_flag) { spin_lock_irqsave(&slave_active_lock, flags);
spin_lock_irqsave(&slave_active_lock, flags); timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING;
timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING; list_del_init(&timeri->ack_list);
list_del_init(&timeri->ack_list); list_del_init(&timeri->active_list);
list_del_init(&timeri->active_list); spin_unlock_irqrestore(&slave_active_lock, flags);
spin_unlock_irqrestore(&slave_active_lock, flags);
}
goto __end; goto __end;
} }
timer = timeri->timer; timer = timeri->timer;
...@@ -520,9 +516,7 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri, ...@@ -520,9 +516,7 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri,
} }
} }
} }
if (!keep_flag) timeri->flags &= ~(SNDRV_TIMER_IFLG_RUNNING | SNDRV_TIMER_IFLG_START);
timeri->flags &=
~(SNDRV_TIMER_IFLG_RUNNING | SNDRV_TIMER_IFLG_START);
spin_unlock_irqrestore(&timer->lock, flags); spin_unlock_irqrestore(&timer->lock, flags);
__end: __end:
if (event != SNDRV_TIMER_EVENT_RESOLUTION) if (event != SNDRV_TIMER_EVENT_RESOLUTION)
...@@ -541,7 +535,7 @@ int snd_timer_stop(struct snd_timer_instance *timeri) ...@@ -541,7 +535,7 @@ int snd_timer_stop(struct snd_timer_instance *timeri)
unsigned long flags; unsigned long flags;
int err; int err;
err = _snd_timer_stop(timeri, 0, SNDRV_TIMER_EVENT_STOP); err = _snd_timer_stop(timeri, SNDRV_TIMER_EVENT_STOP);
if (err < 0) if (err < 0)
return err; return err;
timer = timeri->timer; timer = timeri->timer;
...@@ -585,7 +579,7 @@ int snd_timer_continue(struct snd_timer_instance *timeri) ...@@ -585,7 +579,7 @@ int snd_timer_continue(struct snd_timer_instance *timeri)
*/ */
int snd_timer_pause(struct snd_timer_instance * timeri) int snd_timer_pause(struct snd_timer_instance * timeri)
{ {
return _snd_timer_stop(timeri, 0, SNDRV_TIMER_EVENT_PAUSE); return _snd_timer_stop(timeri, SNDRV_TIMER_EVENT_PAUSE);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment