Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b16813 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: timer: Code cleanup 



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>
parent b5a663aa

sound/core/timer.c

+11 −17
Original line number Diff line number Diff line
@@ -301,8 +301,7 @@ int snd_timer_open(struct snd_timer_instance **ti, 
	return 0;

}



static int _snd_timer_stop(struct snd_timer_instance *timeri,

			   int keep_flag, int event);

static int _snd_timer_stop(struct snd_timer_instance *timeri, int event);



/*

 * close a timer instance
@@ -344,7 +343,7 @@ int snd_timer_close(struct snd_timer_instance *timeri) 
		spin_unlock_irq(&timer->lock);

		mutex_lock(&register_mutex);

		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);

		/* remove slave links */
@@ -484,8 +483,7 @@ int snd_timer_start(struct snd_timer_instance *timeri, unsigned int ticks) 
	return result;

}



static int _snd_timer_stop(struct snd_timer_instance * timeri,

			   int keep_flag, int event)

static int _snd_timer_stop(struct snd_timer_instance *timeri, int event)

{

	struct snd_timer *timer;

	unsigned long flags;
@@ -494,13 +492,11 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri, 
		return -ENXIO;



	if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE) {

		if (!keep_flag) {

		spin_lock_irqsave(&slave_active_lock, flags);

		timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING;

		list_del_init(&timeri->ack_list);

		list_del_init(&timeri->active_list);

		spin_unlock_irqrestore(&slave_active_lock, flags);

		}

		goto __end;

	}

	timer = timeri->timer;
@@ -521,9 +517,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);

      __end:

	if (event != SNDRV_TIMER_EVENT_RESOLUTION)
@@ -542,7 +536,7 @@ int snd_timer_stop(struct snd_timer_instance *timeri) 
	unsigned long flags;

	int err;



	err = _snd_timer_stop(timeri, 0, SNDRV_TIMER_EVENT_STOP);

	err = _snd_timer_stop(timeri, SNDRV_TIMER_EVENT_STOP);

	if (err < 0)

		return err;

	timer = timeri->timer;
@@ -586,7 +580,7 @@ int snd_timer_continue(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);

}



/*