p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: sb: Use setup_timer() and mod_timer() 

No functional change, refactoring with the standard helpers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-19 11:29:42 +01:00
parent 867a0e057f
commit f05b412773
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/isa/sb/emu8000_pcm.c
View File

@ -207,8 +207,7 @@ static void emu8k_pcm_timer_func(unsigned long data)
rec->last_ptr = ptr; rec->last_ptr = ptr;
/* reprogram timer */ /* reprogram timer */
rec->timer.expires = jiffies + 1; mod_timer(&rec->timer, jiffies + 1);
add_timer(&rec->timer);
/* update period */ /* update period */
if (rec->period_pos >= (int)rec->period_size) { if (rec->period_pos >= (int)rec->period_size) {
@ -240,9 +239,7 @@ static int emu8k_pcm_open(struct snd_pcm_substream *subs)
runtime->private_data = rec; runtime->private_data = rec;
spin_lock_init(&rec->timer_lock); spin_lock_init(&rec->timer_lock);
init_timer(&rec->timer); setup_timer(&rec->timer, emu8k_pcm_timer_func, (unsigned long)rec);
rec->timer.function = emu8k_pcm_timer_func;
rec->timer.data = (unsigned long)rec;
runtime->hw = emu8k_pcm_hw; runtime->hw = emu8k_pcm_hw;
runtime->hw.buffer_bytes_max = emu->mem_size - LOOP_BLANK_SIZE * 3; runtime->hw.buffer_bytes_max = emu->mem_size - LOOP_BLANK_SIZE * 3;
@ -359,8 +356,7 @@ static void start_voice(struct snd_emu8k_pcm *rec, int ch)
/* start timer */ /* start timer */
spin_lock_irqsave(&rec->timer_lock, flags); spin_lock_irqsave(&rec->timer_lock, flags);
if (! rec->timer_running) { if (! rec->timer_running) {
rec->timer.expires = jiffies + 1; mod_timer(&rec->timer, jiffies + 1);
add_timer(&rec->timer);
rec->timer_running = 1; rec->timer_running = 1;
} }
spin_unlock_irqrestore(&rec->timer_lock, flags); spin_unlock_irqrestore(&rec->timer_lock, flags);

12
sound/isa/sb/sb8_midi.c
View File

@ -216,8 +216,7 @@ static void snd_sb8dsp_midi_output_timer(unsigned long data)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&chip->open_lock, flags); spin_lock_irqsave(&chip->open_lock, flags);
chip->midi_timer.expires = 1 + jiffies; mod_timer(&chip->midi_timer, 1 + jiffies);
add_timer(&chip->midi_timer);
spin_unlock_irqrestore(&chip->open_lock, flags); spin_unlock_irqrestore(&chip->open_lock, flags);
snd_sb8dsp_midi_output_write(substream); snd_sb8dsp_midi_output_write(substream);
} }
@ -231,11 +230,10 @@ static void snd_sb8dsp_midi_output_trigger(struct snd_rawmidi_substream *substre
spin_lock_irqsave(&chip->open_lock, flags); spin_lock_irqsave(&chip->open_lock, flags);
if (up) { if (up) {
if (!(chip->open & SB_OPEN_MIDI_OUTPUT_TRIGGER)) { if (!(chip->open & SB_OPEN_MIDI_OUTPUT_TRIGGER)) {
init_timer(&chip->midi_timer); setup_timer(&chip->midi_timer,
chip->midi_timer.function = snd_sb8dsp_midi_output_timer; snd_sb8dsp_midi_output_timer,
chip->midi_timer.data = (unsigned long) substream; (unsigned long) substream);
chip->midi_timer.expires = 1 + jiffies; mod_timer(&chip->midi_timer, 1 + jiffies);
add_timer(&chip->midi_timer);
chip->open |= SB_OPEN_MIDI_OUTPUT_TRIGGER; chip->open |= SB_OPEN_MIDI_OUTPUT_TRIGGER;
} }
} else { } else {