Commit b843ce74 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: wavefront: Use setup_timer() and mod_timer()

No functional change, refactoring with the standard helpers.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f05b4127
...@@ -356,8 +356,7 @@ static void snd_wavefront_midi_output_timer(unsigned long data) ...@@ -356,8 +356,7 @@ static void snd_wavefront_midi_output_timer(unsigned long data)
unsigned long flags; unsigned long flags;
spin_lock_irqsave (&midi->virtual, flags); spin_lock_irqsave (&midi->virtual, flags);
midi->timer.expires = 1 + jiffies; mod_timer(&midi->timer, 1 + jiffies);
add_timer(&midi->timer);
spin_unlock_irqrestore (&midi->virtual, flags); spin_unlock_irqrestore (&midi->virtual, flags);
snd_wavefront_midi_output_write(card); snd_wavefront_midi_output_write(card);
} }
...@@ -384,11 +383,10 @@ static void snd_wavefront_midi_output_trigger(struct snd_rawmidi_substream *subs ...@@ -384,11 +383,10 @@ static void snd_wavefront_midi_output_trigger(struct snd_rawmidi_substream *subs
if (up) { if (up) {
if ((midi->mode[mpu] & MPU401_MODE_OUTPUT_TRIGGER) == 0) { if ((midi->mode[mpu] & MPU401_MODE_OUTPUT_TRIGGER) == 0) {
if (!midi->istimer) { if (!midi->istimer) {
init_timer(&midi->timer); setup_timer(&midi->timer,
midi->timer.function = snd_wavefront_midi_output_timer; snd_wavefront_midi_output_timer,
midi->timer.data = (unsigned long) substream->rmidi->card->private_data; (unsigned long) substream->rmidi->card->private_data);
midi->timer.expires = 1 + jiffies; mod_timer(&midi->timer, 1 + jiffies);
add_timer(&midi->timer);
} }
midi->istimer++; midi->istimer++;
midi->mode[mpu] |= MPU401_MODE_OUTPUT_TRIGGER; midi->mode[mpu] |= MPU401_MODE_OUTPUT_TRIGGER;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment