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
cca9cd91
Commit
cca9cd91
authored
Sep 09, 2003
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SERIAL] Fix another missing irqreturn_t (clps711x.c)
parent
c56308f3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
drivers/serial/clps711x.c
drivers/serial/clps711x.c
+7
-5
No files found.
drivers/serial/clps711x.c
View file @
cca9cd91
...
@@ -104,7 +104,7 @@ static void clps711xuart_enable_ms(struct uart_port *port)
...
@@ -104,7 +104,7 @@ static void clps711xuart_enable_ms(struct uart_port *port)
{
{
}
}
static
void
clps711xuart_int_rx
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
static
irqreturn_t
clps711xuart_int_rx
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
{
{
struct
uart_port
*
port
=
dev_id
;
struct
uart_port
*
port
=
dev_id
;
struct
tty_struct
*
tty
=
port
->
info
->
tty
;
struct
tty_struct
*
tty
=
port
->
info
->
tty
;
...
@@ -139,7 +139,7 @@ static void clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *regs)
...
@@ -139,7 +139,7 @@ static void clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *regs)
}
}
out:
out:
tty_flip_buffer_push
(
tty
);
tty_flip_buffer_push
(
tty
);
return
;
return
IRQ_HANDLED
;
handle_error:
handle_error:
if
(
ch
&
UARTDR_PARERR
)
if
(
ch
&
UARTDR_PARERR
)
...
@@ -180,7 +180,7 @@ static void clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *regs)
...
@@ -180,7 +180,7 @@ static void clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *regs)
goto
error_return
;
goto
error_return
;
}
}
static
void
clps711xuart_int_tx
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
static
irqreturn_t
clps711xuart_int_tx
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
{
{
struct
uart_port
*
port
=
dev_id
;
struct
uart_port
*
port
=
dev_id
;
struct
circ_buf
*
xmit
=
&
port
->
info
->
xmit
;
struct
circ_buf
*
xmit
=
&
port
->
info
->
xmit
;
...
@@ -190,11 +190,11 @@ static void clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)
...
@@ -190,11 +190,11 @@ static void clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)
clps_writel
(
port
->
x_char
,
UARTDR
(
port
));
clps_writel
(
port
->
x_char
,
UARTDR
(
port
));
port
->
icount
.
tx
++
;
port
->
icount
.
tx
++
;
port
->
x_char
=
0
;
port
->
x_char
=
0
;
return
;
return
IRQ_HANDLED
;
}
}
if
(
uart_circ_empty
(
xmit
)
||
uart_tx_stopped
(
port
))
{
if
(
uart_circ_empty
(
xmit
)
||
uart_tx_stopped
(
port
))
{
clps711xuart_stop_tx
(
port
,
0
);
clps711xuart_stop_tx
(
port
,
0
);
return
;
return
IRQ_HANDLED
;
}
}
count
=
port
->
fifosize
>>
1
;
count
=
port
->
fifosize
>>
1
;
...
@@ -211,6 +211,8 @@ static void clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)
...
@@ -211,6 +211,8 @@ static void clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)
if
(
uart_circ_empty
(
xmit
))
if
(
uart_circ_empty
(
xmit
))
clps711xuart_stop_tx
(
port
,
0
);
clps711xuart_stop_tx
(
port
,
0
);
return
IRQ_HANDLED
;
}
}
static
unsigned
int
clps711xuart_tx_empty
(
struct
uart_port
*
port
)
static
unsigned
int
clps711xuart_tx_empty
(
struct
uart_port
*
port
)
...
...
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