diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-19 11:41:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-19 11:41:13 +0100 |
| commit | abd083526af3a8a1610e884c8e619925c3d663e6 (patch) | |
| tree | 4a5102f0116722c05eb169e36c099b104c351bfb /sound/synth/emux | |
| parent | da1a39242a946b34cf16a0119a7a3b852b17fef5 (diff) | |
| download | linux-stable-abd083526af3a8a1610e884c8e619925c3d663e6.tar.gz linux-stable-abd083526af3a8a1610e884c8e619925c3d663e6.tar.bz2 linux-stable-abd083526af3a8a1610e884c8e619925c3d663e6.zip | |
ALSA: emux: Use setup_timer() and mod_timer()
No functional change, refactoring with the standard helpers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/synth/emux')
| -rw-r--r-- | sound/synth/emux/emux.c | 4 | ||||
| -rw-r--r-- | sound/synth/emux/emux_synth.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c index f27a1c85f81b..49195325fdf6 100644 --- a/sound/synth/emux/emux.c +++ b/sound/synth/emux/emux.c @@ -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; diff --git a/sound/synth/emux/emux_synth.c b/sound/synth/emux/emux_synth.c index 9a38de459acb..599551b5af44 100644 --- a/sound/synth/emux/emux_synth.c +++ b/sound/synth/emux/emux_synth.c @@ -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; |