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
5491799a
Commit
5491799a
authored
Apr 20, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SOUND SPARC]: Update for irqreturn_t.
parent
4a12ca73
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
sound/sparc/amd7930.c
sound/sparc/amd7930.c
+3
-1
sound/sparc/cs4231.c
sound/sparc/cs4231.c
+4
-2
No files found.
sound/sparc/amd7930.c
View file @
5491799a
...
@@ -497,7 +497,7 @@ static void __amd7930_update_map(amd7930_t *amd)
...
@@ -497,7 +497,7 @@ static void __amd7930_update_map(amd7930_t *amd)
__amd7930_write_map
(
amd
);
__amd7930_write_map
(
amd
);
}
}
static
void
snd_amd7930_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
static
irqreturn_t
snd_amd7930_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
{
{
amd7930_t
*
amd
=
dev_id
;
amd7930_t
*
amd
=
dev_id
;
unsigned
int
elapsed
;
unsigned
int
elapsed
;
...
@@ -536,6 +536,8 @@ static void snd_amd7930_interrupt(int irq, void *dev_id, struct pt_regs *regs)
...
@@ -536,6 +536,8 @@ static void snd_amd7930_interrupt(int irq, void *dev_id, struct pt_regs *regs)
snd_pcm_period_elapsed
(
amd
->
playback_substream
);
snd_pcm_period_elapsed
(
amd
->
playback_substream
);
else
else
snd_pcm_period_elapsed
(
amd
->
capture_substream
);
snd_pcm_period_elapsed
(
amd
->
capture_substream
);
return
IRQ_HANDLED
;
}
}
static
int
snd_amd7930_trigger
(
amd7930_t
*
amd
,
unsigned
int
flag
,
int
cmd
)
static
int
snd_amd7930_trigger
(
amd7930_t
*
amd
,
unsigned
int
flag
,
int
cmd
)
...
...
sound/sparc/cs4231.c
View file @
5491799a
...
@@ -1228,7 +1228,7 @@ static void snd_cs4231_generic_interrupt(cs4231_t *chip)
...
@@ -1228,7 +1228,7 @@ static void snd_cs4231_generic_interrupt(cs4231_t *chip)
}
}
#ifdef SBUS_SUPPORT
#ifdef SBUS_SUPPORT
static
void
snd_cs4231_sbus_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
static
irqreturn_t
snd_cs4231_sbus_interrupt
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
{
{
cs4231_t
*
chip
=
snd_magic_cast
(
cs4231_t
,
dev_id
,
return
);
cs4231_t
*
chip
=
snd_magic_cast
(
cs4231_t
,
dev_id
,
return
);
u32
csr
;
u32
csr
;
...
@@ -1240,12 +1240,14 @@ static void snd_cs4231_sbus_interrupt(int irq, void *dev_id, struct pt_regs *reg
...
@@ -1240,12 +1240,14 @@ static void snd_cs4231_sbus_interrupt(int irq, void *dev_id, struct pt_regs *reg
APC_GENL_INT
|
APC_GENL_INT
|
APC_XINT_PEMP
|
APC_XINT_PEMP
|
APC_XINT_CEMP
)))
APC_XINT_CEMP
)))
return
;
return
IRQ_NONE
;
/* ACK the APC interrupt. */
/* ACK the APC interrupt. */
sbus_writel
(
csr
,
chip
->
port
+
APCCSR
);
sbus_writel
(
csr
,
chip
->
port
+
APCCSR
);
snd_cs4231_generic_interrupt
(
chip
);
snd_cs4231_generic_interrupt
(
chip
);
return
IRQ_HANDLED
;
}
}
#endif
#endif
...
...
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