diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-24 17:34:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-10-24 21:01:33 +0200 |
| commit | 08352b200b203f8f9fa8a1c914acb58c7b10f907 (patch) | |
| tree | fc2e8a322ddfdcbd795d90253591b011512fbcd7 /sound/synth/emux/emux_synth.c | |
| parent | ALSA: drivers: Convert timers to use timer_setup() (diff) | |
| download | linux-08352b200b203f8f9fa8a1c914acb58c7b10f907.tar.xz linux-08352b200b203f8f9fa8a1c914acb58c7b10f907.zip | |
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_synth.c')
| -rw-r--r-- | sound/synth/emux/emux_synth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/synth/emux/emux_synth.c b/sound/synth/emux/emux_synth.c index 599551b5af44..9fa696b0dbde 100644 --- 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; |