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

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

ALSA: emux: Use setup_timer() and mod_timer() 



No functional change, refactoring with the standard helpers.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent da1a3924

sound/synth/emux/emux.c

+1 −3
Original line number Diff line number Diff line
@@ -53,9 +53,7 @@ int snd_emux_new(struct snd_emux **remu) 
	emu->max_voices = 0;

	emu->use_time = 0;



	init_timer(&emu->tlist);

	emu->tlist.function = snd_emux_timer_callback;

	emu->tlist.data = (unsigned long)emu;

	setup_timer(&emu->tlist, snd_emux_timer_callback, (unsigned long)emu);

	emu->timer_active = 0;



	*remu = emu;

sound/synth/emux/emux_synth.c

+2 −4
Original line number Diff line number Diff line
@@ -186,8 +186,7 @@ snd_emux_note_off(void *p, int note, int vel, struct snd_midi_channel *chan) 
				 */

				vp->state = SNDRV_EMUX_ST_PENDING;

				if (! emu->timer_active) {

					emu->tlist.expires = jiffies + 1;

					add_timer(&emu->tlist);

					mod_timer(&emu->tlist, jiffies + 1);

					emu->timer_active = 1;

				}

			} else
@@ -223,8 +222,7 @@ void snd_emux_timer_callback(unsigned long data) 
		}

	}

	if (do_again) {

		emu->tlist.expires = jiffies + 1;

		add_timer(&emu->tlist);

		mod_timer(&emu->tlist, jiffies + 1);

		emu->timer_active = 1;

	} else

		emu->timer_active = 0;