diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-18 06:17:55 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-18 06:17:55 -0500 |
commit | 1f04128a3db7c0f0e8b5d25323eba70ac342f47f (patch) | |
tree | 0740e2abd66a66ad27baed8408a043928b352c0c | |
parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) |
ALSA: hda - Convert from takslet_hi_schedule() to tasklet_schedule()
Replace all tasklet_hi_schedule() callers with the normal
tasklet_schedule(). The former often causes troubles with
RT-kernels, and has actually no merit.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/core/rawmidi.c | 4 | ||||
-rw-r--r-- | sound/core/rtctimer.c | 2 | ||||
-rw-r--r-- | sound/core/timer.c | 2 | ||||
-rw-r--r-- | sound/drivers/vx/vx_core.c | 2 | ||||
-rw-r--r-- | sound/drivers/vx/vx_pcm.c | 2 | ||||
-rw-r--r-- | sound/pci/es1968.c | 2 | ||||
-rw-r--r-- | sound/pci/maestro3.c | 2 | ||||
-rw-r--r-- | sound/pci/mixart/mixart_core.c | 2 | ||||
-rw-r--r-- | sound/pci/pcxhr/pcxhr.c | 2 | ||||
-rw-r--r-- | sound/pci/pcxhr/pcxhr_core.c | 2 | ||||
-rw-r--r-- | sound/pci/riptide/riptide.c | 2 | ||||
-rw-r--r-- | sound/pci/rme9652/hdsp.c | 2 | ||||
-rw-r--r-- | sound/pci/rme9652/hdspm.c | 2 | ||||
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 2 | ||||
-rw-r--r-- | sound/usb/usbmidi.c | 2 |
15 files changed, 16 insertions, 16 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 | |||
151 | if (!substream->opened) | 151 | if (!substream->opened) |
152 | return; | 152 | return; |
153 | if (up) { | 153 | if (up) { |
154 | tasklet_hi_schedule(&substream->runtime->tasklet); | 154 | tasklet_schedule(&substream->runtime->tasklet); |
155 | } else { | 155 | } else { |
156 | tasklet_kill(&substream->runtime->tasklet); | 156 | tasklet_kill(&substream->runtime->tasklet); |
157 | substream->ops->trigger(substream, 0); | 157 | substream->ops->trigger(substream, 0); |
@@ -908,7 +908,7 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream, | |||
908 | } | 908 | } |
909 | if (result > 0) { | 909 | if (result > 0) { |
910 | if (runtime->event) | 910 | if (runtime->event) |
911 | tasklet_hi_schedule(&runtime->tasklet); | 911 | tasklet_schedule(&runtime->tasklet); |
912 | else if (snd_rawmidi_ready(substream)) | 912 | else if (snd_rawmidi_ready(substream)) |
913 | wake_up(&runtime->sleep); | 913 | wake_up(&runtime->sleep); |
914 | } | 914 | } |
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) | |||
118 | */ | 118 | */ |
119 | static void rtctimer_interrupt(void *private_data) | 119 | static void rtctimer_interrupt(void *private_data) |
120 | { | 120 | { |
121 | tasklet_hi_schedule(private_data); | 121 | tasklet_schedule(private_data); |
122 | } | 122 | } |
123 | 123 | ||
124 | 124 | ||
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) | |||
743 | spin_unlock_irqrestore(&timer->lock, flags); | 743 | spin_unlock_irqrestore(&timer->lock, flags); |
744 | 744 | ||
745 | if (use_tasklet) | 745 | if (use_tasklet) |
746 | tasklet_hi_schedule(&timer->task_queue); | 746 | tasklet_schedule(&timer->task_queue); |
747 | } | 747 | } |
748 | 748 | ||
749 | /* | 749 | /* |
diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c index 473b07f6ae85..14e3354be43a 100644 --- a/sound/drivers/vx/vx_core.c +++ b/sound/drivers/vx/vx_core.c | |||
@@ -548,7 +548,7 @@ irqreturn_t snd_vx_irq_handler(int irq, void *dev) | |||
548 | (chip->chip_status & VX_STAT_IS_STALE)) | 548 | (chip->chip_status & VX_STAT_IS_STALE)) |
549 | return IRQ_NONE; | 549 | return IRQ_NONE; |
550 | if (! vx_test_and_ack(chip)) | 550 | if (! vx_test_and_ack(chip)) |
551 | tasklet_hi_schedule(&chip->tq); | 551 | tasklet_schedule(&chip->tq); |
552 | return IRQ_HANDLED; | 552 | return IRQ_HANDLED; |
553 | } | 553 | } |
554 | 554 | ||
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c index 27de574c08f7..6644d0034fba 100644 --- a/sound/drivers/vx/vx_pcm.c +++ b/sound/drivers/vx/vx_pcm.c | |||
@@ -823,7 +823,7 @@ static int vx_pcm_trigger(struct snd_pcm_substream *subs, int cmd) | |||
823 | * we trigger the pipe using tasklet, so that the interrupts are | 823 | * we trigger the pipe using tasklet, so that the interrupts are |
824 | * issued surely after the trigger is completed. | 824 | * issued surely after the trigger is completed. |
825 | */ | 825 | */ |
826 | tasklet_hi_schedule(&pipe->start_tq); | 826 | tasklet_schedule(&pipe->start_tq); |
827 | chip->pcm_running++; | 827 | chip->pcm_running++; |
828 | pipe->running = 1; | 828 | pipe->running = 1; |
829 | break; | 829 | break; |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 20ee7599600b..e9c3794bbcb8 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -1953,7 +1953,7 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id) | |||
1953 | outw(inw(chip->io_port + 4) & 1, chip->io_port + 4); | 1953 | outw(inw(chip->io_port + 4) & 1, chip->io_port + 4); |
1954 | 1954 | ||
1955 | if (event & ESM_HWVOL_IRQ) | 1955 | if (event & ESM_HWVOL_IRQ) |
1956 | tasklet_hi_schedule(&chip->hwvol_tq); /* we'll do this later */ | 1956 | tasklet_schedule(&chip->hwvol_tq); /* we'll do this later */ |
1957 | 1957 | ||
1958 | /* else ack 'em all, i imagine */ | 1958 | /* else ack 'em all, i imagine */ |
1959 | outb(0xFF, chip->io_port + 0x1A); | 1959 | outb(0xFF, chip->io_port + 0x1A); |
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 9ff3f9e34404..59bbaf8f3e5b 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
@@ -1670,7 +1670,7 @@ static irqreturn_t snd_m3_interrupt(int irq, void *dev_id) | |||
1670 | return IRQ_NONE; | 1670 | return IRQ_NONE; |
1671 | 1671 | ||
1672 | if (status & HV_INT_PENDING) | 1672 | if (status & HV_INT_PENDING) |
1673 | tasklet_hi_schedule(&chip->hwvol_tq); | 1673 | tasklet_schedule(&chip->hwvol_tq); |
1674 | 1674 | ||
1675 | /* | 1675 | /* |
1676 | * ack an assp int if its running | 1676 | * ack an assp int if its running |
diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c index b9a06c279397..d3350f383966 100644 --- a/sound/pci/mixart/mixart_core.c +++ b/sound/pci/mixart/mixart_core.c | |||
@@ -550,7 +550,7 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id) | |||
550 | mgr->msg_fifo[mgr->msg_fifo_writeptr] = msg; | 550 | mgr->msg_fifo[mgr->msg_fifo_writeptr] = msg; |
551 | mgr->msg_fifo_writeptr++; | 551 | mgr->msg_fifo_writeptr++; |
552 | mgr->msg_fifo_writeptr %= MSG_FIFO_SIZE; | 552 | mgr->msg_fifo_writeptr %= MSG_FIFO_SIZE; |
553 | tasklet_hi_schedule(&mgr->msg_taskq); | 553 | tasklet_schedule(&mgr->msg_taskq); |
554 | } | 554 | } |
555 | spin_unlock(&mgr->msg_lock); | 555 | spin_unlock(&mgr->msg_lock); |
556 | break; | 556 | break; |
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 73de6e989b3d..8309d4487722 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c | |||
@@ -653,7 +653,7 @@ static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd) | |||
653 | PCXHR_STREAM_STATUS_SCHEDULE_RUN; | 653 | PCXHR_STREAM_STATUS_SCHEDULE_RUN; |
654 | snd_pcm_trigger_done(s, subs); | 654 | snd_pcm_trigger_done(s, subs); |
655 | } | 655 | } |
656 | tasklet_hi_schedule(&chip->mgr->trigger_taskq); | 656 | tasklet_schedule(&chip->mgr->trigger_taskq); |
657 | } else { | 657 | } else { |
658 | stream = subs->runtime->private_data; | 658 | stream = subs->runtime->private_data; |
659 | snd_printdd("Only one Substream %c %d\n", | 659 | snd_printdd("Only one Substream %c %d\n", |
diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c index 7143259cfe34..4a5481f9781f 100644 --- a/sound/pci/pcxhr/pcxhr_core.c +++ b/sound/pci/pcxhr/pcxhr_core.c | |||
@@ -1213,7 +1213,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id) | |||
1213 | mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID; | 1213 | mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID; |
1214 | 1214 | ||
1215 | mgr->src_it_dsp = reg; | 1215 | mgr->src_it_dsp = reg; |
1216 | tasklet_hi_schedule(&mgr->msg_taskq); | 1216 | tasklet_schedule(&mgr->msg_taskq); |
1217 | } | 1217 | } |
1218 | #ifdef CONFIG_SND_DEBUG_VERBOSE | 1218 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
1219 | if (reg & PCXHR_FATAL_DSP_ERR) | 1219 | if (reg & PCXHR_FATAL_DSP_ERR) |
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index e9f0706ed3e4..1d0eeb1f506c 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
@@ -1754,7 +1754,7 @@ snd_riptide_interrupt(int irq, void *dev_id) | |||
1754 | if (IS_EOBIRQ(cif->hwport) || IS_EOSIRQ(cif->hwport) || | 1754 | if (IS_EOBIRQ(cif->hwport) || IS_EOSIRQ(cif->hwport) || |
1755 | IS_EOCIRQ(cif->hwport)) { | 1755 | IS_EOCIRQ(cif->hwport)) { |
1756 | chip->handled_irqs++; | 1756 | chip->handled_irqs++; |
1757 | tasklet_hi_schedule(&chip->riptide_tq); | 1757 | tasklet_schedule(&chip->riptide_tq); |
1758 | } | 1758 | } |
1759 | if (chip->rmidi && IS_MPUIRQ(cif->hwport)) { | 1759 | if (chip->rmidi && IS_MPUIRQ(cif->hwport)) { |
1760 | chip->handled_irqs++; | 1760 | chip->handled_irqs++; |
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 736246f98acc..f87ff0497116 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
@@ -3750,7 +3750,7 @@ static irqreturn_t snd_hdsp_interrupt(int irq, void *dev_id) | |||
3750 | } | 3750 | } |
3751 | } | 3751 | } |
3752 | if (hdsp->use_midi_tasklet && schedule) | 3752 | if (hdsp->use_midi_tasklet && schedule) |
3753 | tasklet_hi_schedule(&hdsp->midi_tasklet); | 3753 | tasklet_schedule(&hdsp->midi_tasklet); |
3754 | return IRQ_HANDLED; | 3754 | return IRQ_HANDLED; |
3755 | } | 3755 | } |
3756 | 3756 | ||
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 98762f909d64..d7dd53675ccd 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
@@ -3476,7 +3476,7 @@ static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id) | |||
3476 | schedule = 1; | 3476 | schedule = 1; |
3477 | } | 3477 | } |
3478 | if (schedule) | 3478 | if (schedule) |
3479 | tasklet_hi_schedule(&hdspm->midi_tasklet); | 3479 | tasklet_schedule(&hdspm->midi_tasklet); |
3480 | return IRQ_HANDLED; | 3480 | return IRQ_HANDLED; |
3481 | } | 3481 | } |
3482 | 3482 | ||
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c index fa4b11398b1f..ea903c8e90dd 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | |||
@@ -41,7 +41,7 @@ irqreturn_t pdacf_interrupt(int irq, void *dev) | |||
41 | if (stat & PDAUDIOCF_IRQOVR) /* should never happen */ | 41 | if (stat & PDAUDIOCF_IRQOVR) /* should never happen */ |
42 | snd_printk(KERN_ERR "PDAUDIOCF SRAM buffer overrun detected!\n"); | 42 | snd_printk(KERN_ERR "PDAUDIOCF SRAM buffer overrun detected!\n"); |
43 | if (chip->pcm_substream) | 43 | if (chip->pcm_substream) |
44 | tasklet_hi_schedule(&chip->tq); | 44 | tasklet_schedule(&chip->tq); |
45 | if (!(stat & PDAUDIOCF_IRQAKM)) | 45 | if (!(stat & PDAUDIOCF_IRQAKM)) |
46 | stat |= PDAUDIOCF_IRQAKM; /* check rate */ | 46 | stat |= PDAUDIOCF_IRQAKM; /* check rate */ |
47 | } | 47 | } |
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c index 5962e4b84423..6d9f9b135c62 100644 --- a/sound/usb/usbmidi.c +++ b/sound/usb/usbmidi.c | |||
@@ -880,7 +880,7 @@ static void snd_usbmidi_output_trigger(struct snd_rawmidi_substream *substream, | |||
880 | snd_rawmidi_transmit_ack(substream, 1); | 880 | snd_rawmidi_transmit_ack(substream, 1); |
881 | return; | 881 | return; |
882 | } | 882 | } |
883 | tasklet_hi_schedule(&port->ep->tasklet); | 883 | tasklet_schedule(&port->ep->tasklet); |
884 | } | 884 | } |
885 | } | 885 | } |
886 | 886 | ||