diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:27 +0100 |
| commit | 8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5 (patch) | |
| tree | 7c0eff65f827891fb4d9f8e46839207c71b26b93 /sound/core | |
| parent | 86b3aa390b4b9925f16a21b98441fd7abdb9fff2 (diff) | |
| parent | 1f04128a3db7c0f0e8b5d25323eba70ac342f47f (diff) | |
Merge branch 'topic/convert-tasklet' into to-push
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/rawmidi.c | 4 | ||||
| -rw-r--r-- | sound/core/rtctimer.c | 2 | ||||
| -rw-r--r-- | sound/core/timer.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index 39672f68ce5d..002777ba336a 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -151,7 +151,7 @@ static inline void snd_rawmidi_output_trigger(struct snd_rawmidi_substream *subs if (!substream->opened) return; if (up) { - tasklet_hi_schedule(&substream->runtime->tasklet); + tasklet_schedule(&substream->runtime->tasklet); } else { tasklet_kill(&substream->runtime->tasklet); substream->ops->trigger(substream, 0); @@ -908,7 +908,7 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream, } if (result > 0) { if (runtime->event) - tasklet_hi_schedule(&runtime->tasklet); + tasklet_schedule(&runtime->tasklet); else if (snd_rawmidi_ready(substream)) wake_up(&runtime->sleep); } diff --git a/sound/core/rtctimer.c b/sound/core/rtctimer.c index 51e64e30dd3b..0851cd13e303 100644 --- a/sound/core/rtctimer.c +++ b/sound/core/rtctimer.c @@ -118,7 +118,7 @@ static void rtctimer_tasklet(unsigned long data) */ static void rtctimer_interrupt(void *private_data) { - tasklet_hi_schedule(private_data); + tasklet_schedule(private_data); } diff --git a/sound/core/timer.c b/sound/core/timer.c index c584408c9f17..796532081e81 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -743,7 +743,7 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left) spin_unlock_irqrestore(&timer->lock, flags); if (use_tasklet) - tasklet_hi_schedule(&timer->task_queue); + tasklet_schedule(&timer->task_queue); } /* |