diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-19 11:34:36 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-19 11:34:36 +0100 |
| commit | c41c009ed5f0d20ab4cbdff37ddbfd072c3c2d92 (patch) | |
| tree | f9e59f49d3e15b9e33e2743b19fcace978ea080c /sound/pci/rme9652 | |
| parent | 3d6f0e0cb348ab1d74cb6fcb2745ebca6029bf9d (diff) | |
| download | op-kernel-dev-c41c009ed5f0d20ab4cbdff37ddbfd072c3c2d92.zip op-kernel-dev-c41c009ed5f0d20ab4cbdff37ddbfd072c3c2d92.tar.gz | |
ALSA: hdsp: 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/pci/rme9652')
| -rw-r--r-- | sound/pci/rme9652/hdsp.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index fe66bcb..98a2d91 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -1428,10 +1428,8 @@ static void snd_hdsp_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); } @@ -1445,11 +1443,9 @@ static void snd_hdsp_midi_output_trigger(struct snd_rawmidi_substream *substream spin_lock_irqsave (&hmidi->lock, flags); if (up) { if (!hmidi->istimer) { - init_timer(&hmidi->timer); - hmidi->timer.function = snd_hdsp_midi_output_timer; - hmidi->timer.data = (unsigned long) hmidi; - hmidi->timer.expires = 1 + jiffies; - add_timer(&hmidi->timer); + setup_timer(&hmidi->timer, snd_hdsp_midi_output_timer, + (unsigned long) hmidi); + mod_timer(&hmidi->timer, 1 + jiffies); hmidi->istimer++; } } else { |
