Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8afabfa7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

parents 86b3aa39 1f04128a

sound/core/rawmidi.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

sound/core/rtctimer.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

sound/core/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



/*

sound/drivers/vx/vx_core.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ irqreturn_t snd_vx_irq_handler(int irq, void *dev) 
	    (chip->chip_status & VX_STAT_IS_STALE))

		return IRQ_NONE;

	if (! vx_test_and_ack(chip))

		tasklet_hi_schedule(&chip->tq);

		tasklet_schedule(&chip->tq);

	return IRQ_HANDLED;

}

sound/drivers/vx/vx_pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static int vx_pcm_trigger(struct snd_pcm_substream *subs, int cmd) 
		 * we trigger the pipe using tasklet, so that the interrupts are

		 * issued surely after the trigger is completed.

		 */ 

		tasklet_hi_schedule(&pipe->start_tq);

		tasklet_schedule(&pipe->start_tq);

		chip->pcm_running++;

		pipe->running = 1;

		break;