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
Kirill Smelkov
linux
Commits
2618b303
Commit
2618b303
authored
Apr 27, 2003
by
François Romieu
Committed by
Anton Blanchard
Apr 27, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[wan dscc4] irqreturn_t update
parent
a2d1d6ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
drivers/net/wan/dscc4.c
drivers/net/wan/dscc4.c
+7
-4
No files found.
drivers/net/wan/dscc4.c
View file @
2618b303
...
...
@@ -337,7 +337,7 @@ static int dscc4_init_ring(struct net_device *);
static
void
dscc4_release_ring
(
struct
dscc4_dev_priv
*
);
static
void
dscc4_timer
(
unsigned
long
);
static
void
dscc4_tx_timeout
(
struct
net_device
*
);
static
void
dscc4_irq
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
ptregs
);
static
irqreturn_t
dscc4_irq
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
ptregs
);
static
int
dscc4_hdlc_attach
(
hdlc_device
*
,
unsigned
short
,
unsigned
short
);
static
int
dscc4_set_iface
(
struct
dscc4_dev_priv
*
,
struct
net_device
*
);
static
inline
int
dscc4_set_quartz
(
struct
dscc4_dev_priv
*
,
int
);
...
...
@@ -1315,14 +1315,14 @@ static int dscc4_set_iface(struct dscc4_dev_priv *dpriv, struct net_device *dev)
return
ret
;
}
static
void
dscc4_irq
(
int
irq
,
void
*
token
,
struct
pt_regs
*
ptregs
)
static
irqreturn_t
dscc4_irq
(
int
irq
,
void
*
token
,
struct
pt_regs
*
ptregs
)
{
struct
dscc4_dev_priv
*
root
=
token
;
struct
dscc4_pci_priv
*
priv
;
struct
net_device
*
dev
;
u32
ioaddr
,
state
;
unsigned
long
flags
;
int
i
;
int
i
,
handled
=
1
;
priv
=
root
->
pci_priv
;
dev
=
hdlc_to_dev
(
&
root
->
hdlc
);
...
...
@@ -1332,8 +1332,10 @@ static void dscc4_irq(int irq, void *token, struct pt_regs *ptregs)
ioaddr
=
dev
->
base_addr
;
state
=
readl
(
ioaddr
+
GSTAR
);
if
(
!
state
)
if
(
!
state
)
{
handled
=
0
;
goto
out
;
}
writel
(
state
,
ioaddr
+
GSTAR
);
if
(
state
&
Arf
)
{
...
...
@@ -1366,6 +1368,7 @@ static void dscc4_irq(int irq, void *token, struct pt_regs *ptregs)
}
out:
spin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
return
IRQ_RETVAL
(
handled
);
}
static
inline
void
dscc4_tx_irq
(
struct
dscc4_pci_priv
*
ppriv
,
...
...
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