ALSA: emux: Convert timers to use timer_setup()

[sfrench/cifs-2.6.git] / sound / synth / emux / emux_synth.c

diff --git a/sound/synth/emux/emux_synth.c b/sound/synth/emux/emux_synth.c
index 599551b5af44cae35477cb010ae380d53009229c..9fa696b0dbde301f944d778be6d861e0dda14f91 100644 (file)
--- a/sound/synth/emux/emux_synth.c
+++ b/sound/synth/emux/emux_synth.c
@@ -202,9 +202,9 @@ snd_emux_note_off(void *p, int note, int vel, struct snd_midi_channel *chan)
  *
  * release the pending note-offs
  */
-void snd_emux_timer_callback(unsigned long data)
+void snd_emux_timer_callback(struct timer_list *t)
 {
-       struct snd_emux *emu = (struct snd_emux *) data;
+       struct snd_emux *emu = from_timer(emu, t, tlist);
        struct snd_emux_voice *vp;
        unsigned long flags;
        int ch, do_again = 0;