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>
This commit is contained in:
Родитель
bc47ba90b0
Коммит
08352b200b
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче