projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] kmemdup() cleanup in drivers/net
[cascardo/linux.git]
/
drivers
/
serial
/
pxa.c
diff --git
a/drivers/serial/pxa.c
b/drivers/serial/pxa.c
index
a720953
..
415fe96
100644
(file)
--- a/
drivers/serial/pxa.c
+++ b/
drivers/serial/pxa.c
@@
-98,8
+98,7
@@
static void serial_pxa_stop_rx(struct uart_port *port)
serial_out(up, UART_IER, up->ier);
}
serial_out(up, UART_IER, up->ier);
}
-static inline void
-receive_chars(struct uart_pxa_port *up, int *status, struct pt_regs *regs)
+static inline void receive_chars(struct uart_pxa_port *up, int *status)
{
struct tty_struct *tty = up->port.info->tty;
unsigned int ch, flag;
{
struct tty_struct *tty = up->port.info->tty;
unsigned int ch, flag;
@@
-153,7
+152,7
@@
receive_chars(struct uart_pxa_port *up, int *status, struct pt_regs *regs)
flag = TTY_FRAME;
}
flag = TTY_FRAME;
}
- if (uart_handle_sysrq_char(&up->port, ch
, regs
))
+ if (uart_handle_sysrq_char(&up->port, ch))
goto ignore_char;
uart_insert_char(&up->port, *status, UART_LSR_OE, ch, flag);
goto ignore_char;
uart_insert_char(&up->port, *status, UART_LSR_OE, ch, flag);
@@
-231,10
+230,9
@@
static inline void check_modem_status(struct uart_pxa_port *up)
/*
* This handles the interrupt from one port.
*/
/*
* This handles the interrupt from one port.
*/
-static inline irqreturn_t
-serial_pxa_irq(int irq, void *dev_id, struct pt_regs *regs)
+static inline irqreturn_t serial_pxa_irq(int irq, void *dev_id)
{
{
- struct uart_pxa_port *up =
(struct uart_pxa_port *)
dev_id;
+ struct uart_pxa_port *up = dev_id;
unsigned int iir, lsr;
iir = serial_in(up, UART_IIR);
unsigned int iir, lsr;
iir = serial_in(up, UART_IIR);
@@
-242,7
+240,7
@@
serial_pxa_irq(int irq, void *dev_id, struct pt_regs *regs)
return IRQ_NONE;
lsr = serial_in(up, UART_LSR);
if (lsr & UART_LSR_DR)
return IRQ_NONE;
lsr = serial_in(up, UART_LSR);
if (lsr & UART_LSR_DR)
- receive_chars(up, &lsr
, regs
);
+ receive_chars(up, &lsr);
check_modem_status(up);
if (lsr & UART_LSR_THRE)
transmit_chars(up);
check_modem_status(up);
if (lsr & UART_LSR_THRE)
transmit_chars(up);