diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-19 11:28:54 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-19 11:32:26 +0100 |
commit | f5d5f75fe167c8b80747290968aeaa91457cb10a (patch) | |
tree | 64beb65379de9f9bcd89283e6bf0571e69e78446 /sound/drivers/opl3/opl3_midi.c | |
parent | 2b1b78114319e0ed2b7ca8c75d9cde6d2bf8f9fc (diff) | |
download | linux-f5d5f75fe167c8b80747290968aeaa91457cb10a.tar.bz2 |
ALSA: opl3: Use setup_timer() and mod_timer()
No functional change, refactoring with the standard helpers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/opl3/opl3_midi.c')
-rw-r--r-- | sound/drivers/opl3/opl3_midi.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c index 6c6d09a51f42..f62780ed64ad 100644 --- a/sound/drivers/opl3/opl3_midi.c +++ b/sound/drivers/opl3/opl3_midi.c @@ -258,12 +258,10 @@ void snd_opl3_timer_func(unsigned long data) spin_unlock_irqrestore(&opl3->voice_lock, flags); spin_lock_irqsave(&opl3->sys_timer_lock, flags); - if (again) { - opl3->tlist.expires = jiffies + 1; /* invoke again */ - add_timer(&opl3->tlist); - } else { + if (again) + mod_timer(&opl3->tlist, jiffies + 1); /* invoke again */ + else opl3->sys_timer_status = 0; - } spin_unlock_irqrestore(&opl3->sys_timer_lock, flags); } @@ -275,8 +273,7 @@ static void snd_opl3_start_timer(struct snd_opl3 *opl3) unsigned long flags; spin_lock_irqsave(&opl3->sys_timer_lock, flags); if (! opl3->sys_timer_status) { - opl3->tlist.expires = jiffies + 1; - add_timer(&opl3->tlist); + mod_timer(&opl3->tlist, jiffies + 1); opl3->sys_timer_status = 1; } spin_unlock_irqrestore(&opl3->sys_timer_lock, flags); |