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

Commit bf3b6440 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] sequencer: remove superfluous function parameter 



Modules: ALSA sequencer

Remove the last parameter of snd_seq_timer_set_tick_resolution()
because it is always one.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent d9ad1bdd

sound/core/seq/seq_timer.c

+4 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ extern int seq_default_timer_resolution; 
#define SKEW_BASE	0x10000	/* 16bit shift */



static void snd_seq_timer_set_tick_resolution(seq_timer_tick_t *tick,

					      int tempo, int ppq, int nticks)

					      int tempo, int ppq)

{

	if (tempo < 1000000)

		tick->resolution = (tempo * 1000) / ppq;
@@ -51,7 +51,6 @@ static void snd_seq_timer_set_tick_resolution(seq_timer_tick_t *tick, 
	}

	if (tick->resolution <= 0)

		tick->resolution = 1;

	tick->resolution *= nticks;

	snd_seq_timer_update_tick(tick, 0);

}
@@ -100,7 +99,7 @@ void snd_seq_timer_defaults(seq_timer_t * tmr) 
	/* setup defaults */

	tmr->ppq = 96;		/* 96 PPQ */

	tmr->tempo = 500000;	/* 120 BPM */

	snd_seq_timer_set_tick_resolution(&tmr->tick, tmr->tempo, tmr->ppq, 1);

	snd_seq_timer_set_tick_resolution(&tmr->tick, tmr->tempo, tmr->ppq);

	tmr->running = 0;



	tmr->type = SNDRV_SEQ_TIMER_ALSA;
@@ -183,7 +182,7 @@ int snd_seq_timer_set_tempo(seq_timer_t * tmr, int tempo) 
	spin_lock_irqsave(&tmr->lock, flags);

	if ((unsigned int)tempo != tmr->tempo) {

		tmr->tempo = tempo;

		snd_seq_timer_set_tick_resolution(&tmr->tick, tmr->tempo, tmr->ppq, 1);

		snd_seq_timer_set_tick_resolution(&tmr->tick, tmr->tempo, tmr->ppq);

	}

	spin_unlock_irqrestore(&tmr->lock, flags);

	return 0;
@@ -207,7 +206,7 @@ int snd_seq_timer_set_ppq(seq_timer_t * tmr, int ppq) 
	}



	tmr->ppq = ppq;

	snd_seq_timer_set_tick_resolution(&tmr->tick, tmr->tempo, tmr->ppq, 1);

	snd_seq_timer_set_tick_resolution(&tmr->tick, tmr->tempo, tmr->ppq);

	spin_unlock_irqrestore(&tmr->lock, flags);

	return 0;

}