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 /sound/pci | |
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>
Diffstat (limited to 'sound/pci')
-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 |
8 files changed, 8 insertions, 8 deletions
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 | ||