redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
No functional change, refactoring with the standard helpers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-19 11:41:13 +01:00
parent da1a39242a
commit abd083526a
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/synth/emux/emux.c
View file

@ -53,9 +53,7 @@ int snd_emux_new(struct snd_emux **remu)
emu->max_voices = 0; emu->max_voices = 0;
emu->use_time = 0; emu->use_time = 0;
init_timer(&emu->tlist); setup_timer(&emu->tlist, snd_emux_timer_callback, (unsigned long)emu);
emu->tlist.function = snd_emux_timer_callback;
emu->tlist.data = (unsigned long)emu;
emu->timer_active = 0; emu->timer_active = 0;
*remu = emu; *remu = emu;

6
sound/synth/emux/emux_synth.c
View file

@ -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; vp->state = SNDRV_EMUX_ST_PENDING;
if (! emu->timer_active) { if (! emu->timer_active) {
emu->tlist.expires = jiffies + 1; mod_timer(&emu->tlist, jiffies + 1);
add_timer(&emu->tlist);
emu->timer_active = 1; emu->timer_active = 1;
} }
} else } else
@ -223,8 +222,7 @@ void snd_emux_timer_callback(unsigned long data)
} }
} }
if (do_again) { if (do_again) {
emu->tlist.expires = jiffies + 1; mod_timer(&emu->tlist, jiffies + 1);
add_timer(&emu->tlist);
emu->timer_active = 1; emu->timer_active = 1;
} else } else
emu->timer_active = 0; emu->timer_active = 0;