summaryrefslogtreecommitdiff
path: root/sound/synth/emux/emux.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-24 08:34:40 -0700
committerTakashi Iwai <tiwai@suse.de>2017-10-24 21:01:33 +0200
commit08352b200b203f8f9fa8a1c914acb58c7b10f907 (patch)
treefc2e8a322ddfdcbd795d90253591b011512fbcd7 /sound/synth/emux/emux.c
parentbc47ba90b01afe468cdd586b0dbe59b64862e2b7 (diff)
ALSA: emux: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/synth/emux/emux.c')
-rw-r--r--sound/synth/emux/emux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index b9981e8c0027..b840ff2dcfbb 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -53,7 +53,7 @@ int snd_emux_new(struct snd_emux **remu)
emu->max_voices = 0;
emu->use_time = 0;
- setup_timer(&emu->tlist, snd_emux_timer_callback, (unsigned long)emu);
+ timer_setup(&emu->tlist, snd_emux_timer_callback, 0);
emu->timer_active = 0;
*remu = emu;