Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
8afabfa7
Commit
8afabfa7
authored
Dec 25, 2008
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/convert-tasklet' into to-push
parents
86b3aa39
1f04128a
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
16 additions
and
16 deletions
+16
-16
sound/core/rawmidi.c
sound/core/rawmidi.c
+2
-2
sound/core/rtctimer.c
sound/core/rtctimer.c
+1
-1
sound/core/timer.c
sound/core/timer.c
+1
-1
sound/drivers/vx/vx_core.c
sound/drivers/vx/vx_core.c
+1
-1
sound/drivers/vx/vx_pcm.c
sound/drivers/vx/vx_pcm.c
+1
-1
sound/pci/es1968.c
sound/pci/es1968.c
+1
-1
sound/pci/maestro3.c
sound/pci/maestro3.c
+1
-1
sound/pci/mixart/mixart_core.c
sound/pci/mixart/mixart_core.c
+1
-1
sound/pci/pcxhr/pcxhr.c
sound/pci/pcxhr/pcxhr.c
+1
-1
sound/pci/pcxhr/pcxhr_core.c
sound/pci/pcxhr/pcxhr_core.c
+1
-1
sound/pci/riptide/riptide.c
sound/pci/riptide/riptide.c
+1
-1
sound/pci/rme9652/hdsp.c
sound/pci/rme9652/hdsp.c
+1
-1
sound/pci/rme9652/hdspm.c
sound/pci/rme9652/hdspm.c
+1
-1
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
+1
-1
sound/usb/usbmidi.c
sound/usb/usbmidi.c
+1
-1
No files found.
sound/core/rawmidi.c
View file @
8afabfa7
...
@@ -151,7 +151,7 @@ static inline void snd_rawmidi_output_trigger(struct snd_rawmidi_substream *subs
...
@@ -151,7 +151,7 @@ static inline void snd_rawmidi_output_trigger(struct snd_rawmidi_substream *subs
if
(
!
substream
->
opened
)
if
(
!
substream
->
opened
)
return
;
return
;
if
(
up
)
{
if
(
up
)
{
tasklet_
hi_
schedule
(
&
substream
->
runtime
->
tasklet
);
tasklet_schedule
(
&
substream
->
runtime
->
tasklet
);
}
else
{
}
else
{
tasklet_kill
(
&
substream
->
runtime
->
tasklet
);
tasklet_kill
(
&
substream
->
runtime
->
tasklet
);
substream
->
ops
->
trigger
(
substream
,
0
);
substream
->
ops
->
trigger
(
substream
,
0
);
...
@@ -908,7 +908,7 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream,
...
@@ -908,7 +908,7 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream,
}
}
if
(
result
>
0
)
{
if
(
result
>
0
)
{
if
(
runtime
->
event
)
if
(
runtime
->
event
)
tasklet_
hi_
schedule
(
&
runtime
->
tasklet
);
tasklet_schedule
(
&
runtime
->
tasklet
);
else
if
(
snd_rawmidi_ready
(
substream
))
else
if
(
snd_rawmidi_ready
(
substream
))
wake_up
(
&
runtime
->
sleep
);
wake_up
(
&
runtime
->
sleep
);
}
}
...
...
sound/core/rtctimer.c
View file @
8afabfa7
...
@@ -118,7 +118,7 @@ static void rtctimer_tasklet(unsigned long data)
...
@@ -118,7 +118,7 @@ static void rtctimer_tasklet(unsigned long data)
*/
*/
static
void
rtctimer_interrupt
(
void
*
private_data
)
static
void
rtctimer_interrupt
(
void
*
private_data
)
{
{
tasklet_
hi_
schedule
(
private_data
);
tasklet_schedule
(
private_data
);
}
}
...
...
sound/core/timer.c
View file @
8afabfa7
...
@@ -743,7 +743,7 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left)
...
@@ -743,7 +743,7 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left)
spin_unlock_irqrestore
(
&
timer
->
lock
,
flags
);
spin_unlock_irqrestore
(
&
timer
->
lock
,
flags
);
if
(
use_tasklet
)
if
(
use_tasklet
)
tasklet_
hi_
schedule
(
&
timer
->
task_queue
);
tasklet_schedule
(
&
timer
->
task_queue
);
}
}
/*
/*
...
...
sound/drivers/vx/vx_core.c
View file @
8afabfa7
...
@@ -548,7 +548,7 @@ irqreturn_t snd_vx_irq_handler(int irq, void *dev)
...
@@ -548,7 +548,7 @@ irqreturn_t snd_vx_irq_handler(int irq, void *dev)
(
chip
->
chip_status
&
VX_STAT_IS_STALE
))
(
chip
->
chip_status
&
VX_STAT_IS_STALE
))
return
IRQ_NONE
;
return
IRQ_NONE
;
if
(
!
vx_test_and_ack
(
chip
))
if
(
!
vx_test_and_ack
(
chip
))
tasklet_
hi_
schedule
(
&
chip
->
tq
);
tasklet_schedule
(
&
chip
->
tq
);
return
IRQ_HANDLED
;
return
IRQ_HANDLED
;
}
}
...
...
sound/drivers/vx/vx_pcm.c
View file @
8afabfa7
...
@@ -823,7 +823,7 @@ static int vx_pcm_trigger(struct snd_pcm_substream *subs, int cmd)
...
@@ -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
* we trigger the pipe using tasklet, so that the interrupts are
* issued surely after the trigger is completed.
* issued surely after the trigger is completed.
*/
*/
tasklet_
hi_
schedule
(
&
pipe
->
start_tq
);
tasklet_schedule
(
&
pipe
->
start_tq
);
chip
->
pcm_running
++
;
chip
->
pcm_running
++
;
pipe
->
running
=
1
;
pipe
->
running
=
1
;
break
;
break
;
...
...
sound/pci/es1968.c
View file @
8afabfa7
...
@@ -1953,7 +1953,7 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id)
...
@@ -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
);
outw
(
inw
(
chip
->
io_port
+
4
)
&
1
,
chip
->
io_port
+
4
);
if
(
event
&
ESM_HWVOL_IRQ
)
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 */
/* else ack 'em all, i imagine */
outb
(
0xFF
,
chip
->
io_port
+
0x1A
);
outb
(
0xFF
,
chip
->
io_port
+
0x1A
);
...
...
sound/pci/maestro3.c
View file @
8afabfa7
...
@@ -1670,7 +1670,7 @@ static irqreturn_t snd_m3_interrupt(int irq, void *dev_id)
...
@@ -1670,7 +1670,7 @@ static irqreturn_t snd_m3_interrupt(int irq, void *dev_id)
return
IRQ_NONE
;
return
IRQ_NONE
;
if
(
status
&
HV_INT_PENDING
)
if
(
status
&
HV_INT_PENDING
)
tasklet_
hi_
schedule
(
&
chip
->
hwvol_tq
);
tasklet_schedule
(
&
chip
->
hwvol_tq
);
/*
/*
* ack an assp int if its running
* ack an assp int if its running
...
...
sound/pci/mixart/mixart_core.c
View file @
8afabfa7
...
@@ -550,7 +550,7 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id)
...
@@ -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
[
mgr
->
msg_fifo_writeptr
]
=
msg
;
mgr
->
msg_fifo_writeptr
++
;
mgr
->
msg_fifo_writeptr
++
;
mgr
->
msg_fifo_writeptr
%=
MSG_FIFO_SIZE
;
mgr
->
msg_fifo_writeptr
%=
MSG_FIFO_SIZE
;
tasklet_
hi_
schedule
(
&
mgr
->
msg_taskq
);
tasklet_schedule
(
&
mgr
->
msg_taskq
);
}
}
spin_unlock
(
&
mgr
->
msg_lock
);
spin_unlock
(
&
mgr
->
msg_lock
);
break
;
break
;
...
...
sound/pci/pcxhr/pcxhr.c
View file @
8afabfa7
...
@@ -653,7 +653,7 @@ static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd)
...
@@ -653,7 +653,7 @@ static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd)
PCXHR_STREAM_STATUS_SCHEDULE_RUN
;
PCXHR_STREAM_STATUS_SCHEDULE_RUN
;
snd_pcm_trigger_done
(
s
,
subs
);
snd_pcm_trigger_done
(
s
,
subs
);
}
}
tasklet_
hi_
schedule
(
&
chip
->
mgr
->
trigger_taskq
);
tasklet_schedule
(
&
chip
->
mgr
->
trigger_taskq
);
}
else
{
}
else
{
stream
=
subs
->
runtime
->
private_data
;
stream
=
subs
->
runtime
->
private_data
;
snd_printdd
(
"Only one Substream %c %d
\n
"
,
snd_printdd
(
"Only one Substream %c %d
\n
"
,
...
...
sound/pci/pcxhr/pcxhr_core.c
View file @
8afabfa7
...
@@ -1213,7 +1213,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id)
...
@@ -1213,7 +1213,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id)
mgr
->
dsp_time_last
=
PCXHR_DSP_TIME_INVALID
;
mgr
->
dsp_time_last
=
PCXHR_DSP_TIME_INVALID
;
mgr
->
src_it_dsp
=
reg
;
mgr
->
src_it_dsp
=
reg
;
tasklet_
hi_
schedule
(
&
mgr
->
msg_taskq
);
tasklet_schedule
(
&
mgr
->
msg_taskq
);
}
}
#ifdef CONFIG_SND_DEBUG_VERBOSE
#ifdef CONFIG_SND_DEBUG_VERBOSE
if
(
reg
&
PCXHR_FATAL_DSP_ERR
)
if
(
reg
&
PCXHR_FATAL_DSP_ERR
)
...
...
sound/pci/riptide/riptide.c
View file @
8afabfa7
...
@@ -1754,7 +1754,7 @@ snd_riptide_interrupt(int irq, void *dev_id)
...
@@ -1754,7 +1754,7 @@ snd_riptide_interrupt(int irq, void *dev_id)
if
(
IS_EOBIRQ
(
cif
->
hwport
)
||
IS_EOSIRQ
(
cif
->
hwport
)
||
if
(
IS_EOBIRQ
(
cif
->
hwport
)
||
IS_EOSIRQ
(
cif
->
hwport
)
||
IS_EOCIRQ
(
cif
->
hwport
))
{
IS_EOCIRQ
(
cif
->
hwport
))
{
chip
->
handled_irqs
++
;
chip
->
handled_irqs
++
;
tasklet_
hi_
schedule
(
&
chip
->
riptide_tq
);
tasklet_schedule
(
&
chip
->
riptide_tq
);
}
}
if
(
chip
->
rmidi
&&
IS_MPUIRQ
(
cif
->
hwport
))
{
if
(
chip
->
rmidi
&&
IS_MPUIRQ
(
cif
->
hwport
))
{
chip
->
handled_irqs
++
;
chip
->
handled_irqs
++
;
...
...
sound/pci/rme9652/hdsp.c
View file @
8afabfa7
...
@@ -3750,7 +3750,7 @@ static irqreturn_t snd_hdsp_interrupt(int irq, void *dev_id)
...
@@ -3750,7 +3750,7 @@ static irqreturn_t snd_hdsp_interrupt(int irq, void *dev_id)
}
}
}
}
if
(
hdsp
->
use_midi_tasklet
&&
schedule
)
if
(
hdsp
->
use_midi_tasklet
&&
schedule
)
tasklet_
hi_
schedule
(
&
hdsp
->
midi_tasklet
);
tasklet_schedule
(
&
hdsp
->
midi_tasklet
);
return
IRQ_HANDLED
;
return
IRQ_HANDLED
;
}
}
...
...
sound/pci/rme9652/hdspm.c
View file @
8afabfa7
...
@@ -3476,7 +3476,7 @@ static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
...
@@ -3476,7 +3476,7 @@ static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
schedule
=
1
;
schedule
=
1
;
}
}
if
(
schedule
)
if
(
schedule
)
tasklet_
hi_
schedule
(
&
hdspm
->
midi_tasklet
);
tasklet_schedule
(
&
hdspm
->
midi_tasklet
);
return
IRQ_HANDLED
;
return
IRQ_HANDLED
;
}
}
...
...
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
View file @
8afabfa7
...
@@ -41,7 +41,7 @@ irqreturn_t pdacf_interrupt(int irq, void *dev)
...
@@ -41,7 +41,7 @@ irqreturn_t pdacf_interrupt(int irq, void *dev)
if
(
stat
&
PDAUDIOCF_IRQOVR
)
/* should never happen */
if
(
stat
&
PDAUDIOCF_IRQOVR
)
/* should never happen */
snd_printk
(
KERN_ERR
"PDAUDIOCF SRAM buffer overrun detected!
\n
"
);
snd_printk
(
KERN_ERR
"PDAUDIOCF SRAM buffer overrun detected!
\n
"
);
if
(
chip
->
pcm_substream
)
if
(
chip
->
pcm_substream
)
tasklet_
hi_
schedule
(
&
chip
->
tq
);
tasklet_schedule
(
&
chip
->
tq
);
if
(
!
(
stat
&
PDAUDIOCF_IRQAKM
))
if
(
!
(
stat
&
PDAUDIOCF_IRQAKM
))
stat
|=
PDAUDIOCF_IRQAKM
;
/* check rate */
stat
|=
PDAUDIOCF_IRQAKM
;
/* check rate */
}
}
...
...
sound/usb/usbmidi.c
View file @
8afabfa7
...
@@ -880,7 +880,7 @@ static void snd_usbmidi_output_trigger(struct snd_rawmidi_substream *substream,
...
@@ -880,7 +880,7 @@ static void snd_usbmidi_output_trigger(struct snd_rawmidi_substream *substream,
snd_rawmidi_transmit_ack
(
substream
,
1
);
snd_rawmidi_transmit_ack
(
substream
,
1
);
return
;
return
;
}
}
tasklet_
hi_
schedule
(
&
port
->
ep
->
tasklet
);
tasklet_schedule
(
&
port
->
ep
->
tasklet
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment