ALSA: sb: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. [Re-use the existing chip->midi_substream_output instead of assigning a new field to struct snd_sb -- tiwai] Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
@@ -193,9 +193,9 @@ static inline int emu8k_get_curpos(struct snd_emu8k_pcm *rec, int ch)
|
||||
* timer interrupt handler
|
||||
* check the current position and update the period if necessary.
|
||||
*/
|
||||
static void emu8k_pcm_timer_func(unsigned long data)
|
||||
static void emu8k_pcm_timer_func(struct timer_list *t)
|
||||
{
|
||||
struct snd_emu8k_pcm *rec = (struct snd_emu8k_pcm *)data;
|
||||
struct snd_emu8k_pcm *rec = from_timer(rec, t, timer);
|
||||
int ptr, delta;
|
||||
|
||||
spin_lock(&rec->timer_lock);
|
||||
@@ -241,7 +241,7 @@ static int emu8k_pcm_open(struct snd_pcm_substream *subs)
|
||||
runtime->private_data = rec;
|
||||
|
||||
spin_lock_init(&rec->timer_lock);
|
||||
setup_timer(&rec->timer, emu8k_pcm_timer_func, (unsigned long)rec);
|
||||
timer_setup(&rec->timer, emu8k_pcm_timer_func, 0);
|
||||
|
||||
runtime->hw = emu8k_pcm_hw;
|
||||
runtime->hw.buffer_bytes_max = emu->mem_size - LOOP_BLANK_SIZE * 3;
|
||||
|
Reference in New Issue
Block a user