]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ALSA: hdsp: Use setup_timer() and mod_timer()
authorTakashi Iwai <tiwai@suse.de>
Mon, 19 Jan 2015 10:34:36 +0000 (11:34 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 19 Jan 2015 10:34:36 +0000 (11:34 +0100)
No functional change, refactoring with the standard helpers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/rme9652/hdsp.c

index fe66bcb21475b29c39b75a1545ec4748db74b08d..98a2d911ef17274a18284ead8fa74d424742f40a 100644 (file)
@@ -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 {