Merge branch 'topic/convert-tasklet' into to-push

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);
 }
 
 /*