ALSA: wavefront: Use setup_timer() and mod_timer() (b843ce74) · Commits · 戴 / test

sound/isa/wavefront/wavefront_midi.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -356,8 +356,7 @@ static void snd_wavefront_midi_output_timer(unsigned long data)
		unsigned long flags;

		spin_lock_irqsave (&midi->virtual, flags);
		midi->timer.expires = 1 + jiffies;
		add_timer(&midi->timer);
		mod_timer(&midi->timer, 1 + jiffies);
		spin_unlock_irqrestore (&midi->virtual, flags);
		snd_wavefront_midi_output_write(card);
		}
		@@ -384,11 +383,10 @@ static void snd_wavefront_midi_output_trigger(struct snd_rawmidi_substream *subs
		if (up) {
		if ((midi->mode[mpu] & MPU401_MODE_OUTPUT_TRIGGER) == 0) {
		if (!midi->istimer) {
		init_timer(&midi->timer);
		midi->timer.function = snd_wavefront_midi_output_timer;
		midi->timer.data = (unsigned long) substream->rmidi->card->private_data;
		midi->timer.expires = 1 + jiffies;
		add_timer(&midi->timer);
		setup_timer(&midi->timer,
		snd_wavefront_midi_output_timer,
		(unsigned long) substream->rmidi->card->private_data);
		mod_timer(&midi->timer, 1 + jiffies);
		}
		midi->istimer++;
		midi->mode[mpu] \|= MPU401_MODE_OUTPUT_TRIGGER;