redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Kees Cook 2017-10-24 08:34:40 -07:00 committed by Takashi Iwai
parent bc47ba90b0
commit 08352b200b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/synth/emux/emux.c
View File

@ -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;

4
sound/synth/emux/emux_synth.c
View File

@ -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;

2
sound/synth/emux/emux_voice.h
View File

@ -55,7 +55,7 @@ void snd_emux_update_channel(struct snd_emux_port *port,
struct snd_midi_channel *chan, int update);
void snd_emux_update_port(struct snd_emux_port *port, int update);
void snd_emux_timer_callback(unsigned long data);
void snd_emux_timer_callback(struct timer_list *t);
/* emux_effect.c */
#ifdef SNDRV_EMUX_USE_RAW_EFFECT