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

No functional change, refactoring with the standard helpers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

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;