diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-18 12:17:55 +0100 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-18 12:17:55 +0100 | 
| commit | 1f04128a3db7c0f0e8b5d25323eba70ac342f47f (patch) | |
| tree | 0740e2abd66a66ad27baed8408a043928b352c0c | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
| download | olio-linux-3.10-1f04128a3db7c0f0e8b5d25323eba70ac342f47f.tar.xz olio-linux-3.10-1f04128a3db7c0f0e8b5d25323eba70ac342f47f.zip  | |
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 39672f68ce5..002777ba336 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 51e64e30dd3..0851cd13e30 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 c584408c9f1..796532081e8 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);  }  /* diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c index 473b07f6ae8..14e3354be43 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)  	    (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;  } diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c index 27de574c08f..6644d0034fb 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)  		 * 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; diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 20ee7599600..e9c3794bbcb 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)  	outw(inw(chip->io_port + 4) & 1, chip->io_port + 4);  	if (event & ESM_HWVOL_IRQ) -		tasklet_hi_schedule(&chip->hwvol_tq); /* we'll do this later */ +		tasklet_schedule(&chip->hwvol_tq); /* we'll do this later */  	/* else ack 'em all, i imagine */  	outb(0xFF, chip->io_port + 0x1A); diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 9ff3f9e3440..59bbaf8f3e5 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)  		return IRQ_NONE;  	if (status & HV_INT_PENDING) -		tasklet_hi_schedule(&chip->hwvol_tq); +		tasklet_schedule(&chip->hwvol_tq);  	/*  	 * ack an assp int if its running diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c index b9a06c27939..d3350f38396 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)  				mgr->msg_fifo[mgr->msg_fifo_writeptr] = msg;  				mgr->msg_fifo_writeptr++;  				mgr->msg_fifo_writeptr %= MSG_FIFO_SIZE; -				tasklet_hi_schedule(&mgr->msg_taskq); +				tasklet_schedule(&mgr->msg_taskq);  			}  			spin_unlock(&mgr->msg_lock);  			break; diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 73de6e989b3..8309d448772 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)  					PCXHR_STREAM_STATUS_SCHEDULE_RUN;  				snd_pcm_trigger_done(s, subs);  			} -			tasklet_hi_schedule(&chip->mgr->trigger_taskq); +			tasklet_schedule(&chip->mgr->trigger_taskq);  		} else {  			stream = subs->runtime->private_data;  			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 7143259cfe3..4a5481f9781 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)  		mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID;  		mgr->src_it_dsp = reg; -		tasklet_hi_schedule(&mgr->msg_taskq); +		tasklet_schedule(&mgr->msg_taskq);  	}  #ifdef CONFIG_SND_DEBUG_VERBOSE  	if (reg & PCXHR_FATAL_DSP_ERR) diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index e9f0706ed3e..1d0eeb1f506 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)  		if (IS_EOBIRQ(cif->hwport) || IS_EOSIRQ(cif->hwport) ||  		    IS_EOCIRQ(cif->hwport)) {  			chip->handled_irqs++; -			tasklet_hi_schedule(&chip->riptide_tq); +			tasklet_schedule(&chip->riptide_tq);  		}  		if (chip->rmidi && IS_MPUIRQ(cif->hwport)) {  			chip->handled_irqs++; diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 736246f98ac..f87ff049711 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)  		}  	}  	if (hdsp->use_midi_tasklet && schedule) -		tasklet_hi_schedule(&hdsp->midi_tasklet); +		tasklet_schedule(&hdsp->midi_tasklet);  	return IRQ_HANDLED;  } diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 98762f909d6..d7dd53675cc 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)  		schedule = 1;  	}  	if (schedule) -		tasklet_hi_schedule(&hdspm->midi_tasklet); +		tasklet_schedule(&hdspm->midi_tasklet);  	return IRQ_HANDLED;  } diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c index fa4b11398b1..ea903c8e90d 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)  		if (stat & PDAUDIOCF_IRQOVR)	/* should never happen */  			snd_printk(KERN_ERR "PDAUDIOCF SRAM buffer overrun detected!\n");  		if (chip->pcm_substream) -			tasklet_hi_schedule(&chip->tq); +			tasklet_schedule(&chip->tq);  		if (!(stat & PDAUDIOCF_IRQAKM))  			stat |= PDAUDIOCF_IRQAKM;	/* check rate */  	} diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c index 5962e4b8442..6d9f9b135c6 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,  				snd_rawmidi_transmit_ack(substream, 1);  			return;  		} -		tasklet_hi_schedule(&port->ep->tasklet); +		tasklet_schedule(&port->ep->tasklet);  	}  }  |