forked from Minki/linux
ALSA: hdspm: Use setup_timer() and mod_timer()
No functional change, refactoring with the standard helpers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
c41c009ed5
commit
04018e137c
@ -1957,10 +1957,8 @@ static void snd_hdspm_midi_output_timer(unsigned long data)
|
||||
leaving istimer wherever it was set before.
|
||||
*/
|
||||
|
||||
if (hmidi->istimer) {
|
||||
hmidi->timer.expires = 1 + jiffies;
|
||||
add_timer(&hmidi->timer);
|
||||
}
|
||||
if (hmidi->istimer)
|
||||
mod_timer(&hmidi->timer, 1 + jiffies);
|
||||
|
||||
spin_unlock_irqrestore (&hmidi->lock, flags);
|
||||
}
|
||||
@ -1975,11 +1973,9 @@ snd_hdspm_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
|
||||
spin_lock_irqsave (&hmidi->lock, flags);
|
||||
if (up) {
|
||||
if (!hmidi->istimer) {
|
||||
init_timer(&hmidi->timer);
|
||||
hmidi->timer.function = snd_hdspm_midi_output_timer;
|
||||
hmidi->timer.data = (unsigned long) hmidi;
|
||||
hmidi->timer.expires = 1 + jiffies;
|
||||
add_timer(&hmidi->timer);
|
||||
setup_timer(&hmidi->timer, snd_hdspm_midi_output_timer,
|
||||
(unsigned long) hmidi);
|
||||
mod_timer(&hmidi->timer, 1 + jiffies);
|
||||
hmidi->istimer++;
|
||||
}
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user