From: Takashi Iwai Date: Mon, 19 Jan 2015 10:33:20 +0000 (+0100) Subject: ALSA: echoaudio: Use setup_timer() and mod_timer() X-Git-Tag: v4.0-rc1~129^2~43^2~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8a3e7dfc90dcb2ed6e79b559ce072aeaec291ebd;p=karo-tx-linux.git ALSA: echoaudio: Use setup_timer() and mod_timer() No functional change, refactoring with the standard helpers. Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/echoaudio/midi.c b/sound/pci/echoaudio/midi.c index d913749d154a..a8fe58335ddc 100644 --- a/sound/pci/echoaudio/midi.c +++ b/sound/pci/echoaudio/midi.c @@ -257,9 +257,8 @@ static void snd_echo_midi_output_trigger(struct snd_rawmidi_substream *substream spin_lock_irq(&chip->lock); if (up) { if (!chip->tinuse) { - init_timer(&chip->timer); - chip->timer.function = snd_echo_midi_output_write; - chip->timer.data = (unsigned long)chip; + setup_timer(&chip->timer, snd_echo_midi_output_write, + (unsigned long)chip); chip->tinuse = 1; } } else {